From 69f0cc55a7ff8cf376ce8298f1315bcc798cd36f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zolt=C3=A1n=20Felleg?= Date: Thu, 17 Oct 2024 15:03:46 +0200 Subject: [PATCH] Updated fdc.in (updated password distribution server). --- .../c3d/firstboot/scripts/90_setupservices.sh | 2 -- .../c3d/postinstall/install-data/etc/pds.conf | 25 ------------------- .../postinstall/install-data/etc/rsyncd.conf | 9 ------- .../postinstall/scripts/10_setupservices.sh | 1 - .../c3d/preinstall/scripts/01_rsyncpdsdb.sh | 13 ---------- sources/fdc.in/envvars | 1 - 6 files changed, 51 deletions(-) delete mode 100644 sources/fdc.in/c3d/postinstall/install-data/etc/rsyncd.conf delete mode 100755 sources/fdc.in/c3d/preinstall/scripts/01_rsyncpdsdb.sh diff --git a/sources/fdc.in/c3d/firstboot/scripts/90_setupservices.sh b/sources/fdc.in/c3d/firstboot/scripts/90_setupservices.sh index 9d9dc71..cba9a53 100755 --- a/sources/fdc.in/c3d/firstboot/scripts/90_setupservices.sh +++ b/sources/fdc.in/c3d/firstboot/scripts/90_setupservices.sh @@ -11,8 +11,6 @@ systemctl enable pds.service systemctl start pds.service systemctl enable postfix.service systemctl start postfix.service -systemctl enable rsyncd.service -systemctl start rsyncd.service systemctl enable sssd.service systemctl start sssd.service diff --git a/sources/fdc.in/c3d/postinstall/install-data/etc/pds.conf b/sources/fdc.in/c3d/postinstall/install-data/etc/pds.conf index 7f18598..5f7cacc 100644 --- a/sources/fdc.in/c3d/postinstall/install-data/etc/pds.conf +++ b/sources/fdc.in/c3d/postinstall/install-data/etc/pds.conf @@ -1,28 +1,3 @@ [server] address = port = 1420 -database = /var/lib/pds/db - -[targets] -count = 3 - -[target.1] -format = cleartext -method = ssh smbpasswd -ssh host = store - -[target.2] -format = htdigest -htdigest realm = webdrive -method = rsync -rsync host = store.in.useribm.hu -rsync module = httpdauth -rsync file = webdrive.digest - -[target.3] -format = htdigest -htdigest realm = ceges -method = rsync -rsync host = store.in.useribm.hu -rsync module = httpdauth -rsync file = ceges.digest diff --git a/sources/fdc.in/c3d/postinstall/install-data/etc/rsyncd.conf b/sources/fdc.in/c3d/postinstall/install-data/etc/rsyncd.conf deleted file mode 100644 index cbc3409..0000000 --- a/sources/fdc.in/c3d/postinstall/install-data/etc/rsyncd.conf +++ /dev/null @@ -1,9 +0,0 @@ -transfer logging = yes -use chroot = no -uid = root -gid = root - -[pdsdb] - path = /var/lib/pds - read only = true - hosts allow = 10.228.0.0/16, 2001:1aa1:000a:7dae::/64 diff --git a/sources/fdc.in/c3d/postinstall/scripts/10_setupservices.sh b/sources/fdc.in/c3d/postinstall/scripts/10_setupservices.sh index d7570d9..f017557 100755 --- a/sources/fdc.in/c3d/postinstall/scripts/10_setupservices.sh +++ b/sources/fdc.in/c3d/postinstall/scripts/10_setupservices.sh @@ -6,7 +6,6 @@ systemctl disable httpd.service systemctl disable oddjobd.service systemctl disable pds.service systemctl disable postfix.service -systemctl disable rsyncd.service systemctl disable sssd.service systemctl disable NetworkManager-wait-online.service diff --git a/sources/fdc.in/c3d/preinstall/scripts/01_rsyncpdsdb.sh b/sources/fdc.in/c3d/preinstall/scripts/01_rsyncpdsdb.sh deleted file mode 100755 index 40ad8a1..0000000 --- a/sources/fdc.in/c3d/preinstall/scripts/01_rsyncpdsdb.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - - -. $1 - - -/usr/bin/rsync \ - --archive \ - --delete-after \ - --info=STATS \ - --mkpath \ - fdc.in.useribm.hu::pdsdb \ - $CONTAINER_BUILDROOT/c3d/postinstall/install-data/var/lib/pds diff --git a/sources/fdc.in/envvars b/sources/fdc.in/envvars index 4cf40d8..32cf6d2 100644 --- a/sources/fdc.in/envvars +++ b/sources/fdc.in/envvars @@ -13,5 +13,4 @@ SPEC_PACKAGES="authselect \ python-unversioned-command \ python3-ldap \ python3-mod_wsgi \ - rsync-daemon \ sssd-ldap" -- 2.54.0