X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ffiles%2Fsecurity_master%2Frsyncd.conf;h=7ea05c491b0b02a0de3d7c5a5e2bc80010fb7f91;hb=b4d1d99e5457599c6e30e4ee6f565b753d8eba4c;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..7ea05c491 100644
--- a/modules/roles/files/security_master/rsyncd.conf
+++ b/modules/roles/files/security_master/rsyncd.conf
@@ -9,6 +9,7 @@ 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
@@ -21,34 +22,18 @@ log file = /var/log/rsyncd/rsyncd.log
   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 = *
+[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