Merge remote-tracking branch 'waldi/managed-rsyncd-ftp-master'

* waldi/managed-rsyncd-ftp-master:
  Use archvsync managed secrets files for rsyncd on ftp-master

diff --git a/modules/roles/files/dakmaster/rsyncd.conf b/modules/roles/files/dakmaster/rsyncd.conf
index 23b74f8..47b9c8a 100644 (file)
--- a/modules/roles/files/dakmaster/rsyncd.conf
+++ b/modules/roles/files/dakmaster/rsyncd.conf
@@ -18,14 +18,16 @@ log file = /var/log/rsyncd/rsyncd.log
   comment = Full Debian FTP Archive (huge and growing)
   auth users = *
   read only = true
-  secrets file = /etc/rsyncd/ftp.secrets
+  secrets file = /home/archvsync/rsyncd/debian.secrets
+  strict modes = false
 
 [debian-debug]
   path = /srv/ftp-master.debian.org/mirror/debian-debug
   comment = Debug packages.  Probably large.  Starting mid 2015.
   auth users = *
   read only = true
-  secrets file = /etc/rsyncd/ftp.secrets
+  secrets file = /home/archvsync/rsyncd/debian-debug.secrets
+  strict modes = false
   list = no
 
 [buildd-keyrings]
@@ -41,4 +43,5 @@ log file = /var/log/rsyncd/rsyncd.log
   read only = true
   list = no
   auth users = *
-  secrets file = /etc/rsyncd/buildd.secrets
+  secrets file = /home/archvsync/rsyncd/debian-buildd-dists.secrets
+  strict modes = false