X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ffiles%2Fsecurity_master%2Frsyncd.conf;h=e426a8c8b3cf13abb91c1153081ad39b4e5b9b04;hb=694793a4317a94b7dc1483f4a52d4b1868224ed6;hp=1049ea6ecd7f5f29abb3c7598283e75f2e37db26;hpb=a67561eaafa004803b1f5c824898bba88a25412e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/files/security_master/rsyncd.conf b/modules/roles/files/security_master/rsyncd.conf
index 1049ea6ec..e426a8c8b 100644
--- a/modules/roles/files/security_master/rsyncd.conf
+++ b/modules/roles/files/security_master/rsyncd.conf
@@ -1,54 +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
-  read only = true
-  secrets file = /etc/rsyncd/exports.secrets
-  list = no
-
-[exports]
-  path = /srv/security.debian.org/rsync/export
-  comment = Various metadata exports
-  auth users = *
-  read only = true
-  secrets file = /etc/rsyncd/exports.secrets
-  list = no
-
-[buildd-lenny]
-  path = /srv/security-master.debian.org/buildd/lenny/
-  comment = Buildd directory oldstable security
-  auth users = *
-  read only = true
-  secrets file = /etc/rsyncd/buildd.secrets
-  list = no
-
-[buildd-squeeze]
-  path = /srv/security-master.debian.org/buildd/squeeze/
-  comment = Buildd directory stable security
-  auth users = *
-  read only = true
-  secrets file = /etc/rsyncd/buildd.secrets
-  list = no
-
-[buildd-wheezy]
-  path = /srv/security-master.debian.org/buildd/wheezy/
-  comment = Buildd directory testing security
   auth users = *
-  read only = true
-  secrets file = /etc/rsyncd/buildd.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
+  auth users = *
+  secrets file = /home/archvsync/rsyncd/debian-security-buildd-pool.secrets