Merge remote-tracking branch 'waldi/keyring-ssl'

[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 34e0028..8cf2f8f 100644 (file)
--- a/modules/roles/files/security_master/rsyncd.conf
+++ b/modules/roles/files/security_master/rsyncd.conf
@@ -9,45 +9,26 @@ log file = /var/log/rsyncd/rsyncd.log
 [debian-security]
   path = /srv/security.debian.org/archive/debian-security/
   comment = Debian security archive
-  read only = true
-  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
+  secrets file = /home/archvsync/rsyncd/debian-security.secrets
+  strict modes = false
   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
+  secrets file = /home/archvsync/rsyncd/debian-security-buildd-dists.secrets
+  strict modes = false
 
-[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 = /home/archvsync/rsyncd/debian-security-buildd-pool.secrets
+  strict modes = false