X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ffiles%2Fsecurity_master%2Frsyncd.conf;h=7ea05c491b0b02a0de3d7c5a5e2bc80010fb7f91;hb=d5860b0cc2d81d2332b8035b1a279a7fafda4890;hp=ac953dafde64e13d3cd664ce2f83f2315104762e;hpb=bf1f67c1d65d4d297e7706726201b3d0d01f1f8c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/files/security_master/rsyncd.conf b/modules/roles/files/security_master/rsyncd.conf
index ac953dafd..7ea05c491 100644
--- a/modules/roles/files/security_master/rsyncd.conf
+++ b/modules/roles/files/security_master/rsyncd.conf
@@ -9,7 +9,10 @@ log file = /var/log/rsyncd/rsyncd.log
 [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
 
 [exports]
   path = /srv/security.debian.org/rsync/export
@@ -17,35 +20,20 @@ log file = /var/log/rsyncd/rsyncd.log
   auth users = *
   read only = true
   secrets file = /etc/rsyncd/exports.secrets
-
-[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 = *
+[debian-security-buildd-dists]
+  path = /srv/security-master.debian.org/buildd/debian-security-buildd/dists
+  comment = buildd archive
   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
 
-[debian-security-buildd-dists]
-  path = /srv/security-master.debian.org/buildd/debian-security-buildd/dists
-  comment = buildd archive
+[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.secrets
+  secrets file = /etc/rsyncd/buildd-pool.secrets