Merge remote-tracking branch 'waldi/rsync-cleanup'

[mirror/dsa-puppet.git] / modules / roles / files / security_master / rsyncd.conf

diff --git a/modules/roles/files/security_master/rsyncd.conf b/modules/roles/files/security_master/rsyncd.conf
index f1b4926..e426a8c 100644 (file)
--- a/modules/roles/files/security_master/rsyncd.conf
+++ b/modules/roles/files/security_master/rsyncd.conf
@@ -1,31 +1,27 @@
 uid = nobody
 gid = nogroup
-max connections = 20
 syslog facility = daemon
 socket options = SO_KEEPALIVE
+reverse lookup = false
 timeout = 7200
 log file = /var/log/rsyncd/rsyncd.log
 
+list = no
+read only = true
+ignore nonreadable = true
+strict modes = false
+
 [debian-security]
   path = /srv/security.debian.org/archive/debian-security/
-  comment = Debian security archive
   auth users = *
-  read only = true
-  secrets file = /etc/rsyncd/exports.secrets
-  list = no
+  secrets file = /home/archvsync/rsyncd/debian-security.secrets
 
 [debian-security-buildd-dists]
   path = /srv/security-master.debian.org/buildd/debian-security-buildd/dists
-  comment = buildd archive
-  read only = true
-  list = no
   auth users = *
-  secrets file = /etc/rsyncd/buildd.secrets
+  secrets file = /home/archvsync/rsyncd/debian-security-buildd-dists.secrets
 
 [debian-security-buildd-pool]
   path = /srv/security-master.debian.org/buildd/debian-security-buildd/pool
-  comment = buildd pool
-  read only = true
-  list = no
   auth users = *
-  secrets file = /etc/rsyncd/buildd-pool.secrets
+  secrets file = /home/archvsync/rsyncd/debian-security-buildd-pool.secrets