Updated fdc.in (updated password distribution server).

diff --git a/sources/fdc.in/c3d/firstboot/scripts/90_setupservices.sh b/sources/fdc.in/c3d/firstboot/scripts/90_setupservices.sh
index 9d9dc71241cff7db9e59800f1d559e4fba2228a1..cba9a5328de0f2253bf5e066d2482e67bc3bdfe3 100755 (executable)
--- 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 7f18598fed21ee8e847ed65c3335446566d7bb80..5f7cacc206ec51ea618cb9e669752015211c9255 100644 (file)
--- 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 (file)
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 d7570d9abb84b4935ecb5f5c621d8ecc515d63ca..f017557fa8111581c1d9b82249bbbac2519cd7d2 100755 (executable)
--- 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 (executable)
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 4cf40d84745078d74ce6895592ad9d89d262117a..32cf6d2514c9e6c093fec07bd893fe03f32f86c1 100644 (file)
--- 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"