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 982fbb5..8cf2f8f 100644 (file)
--- a/modules/roles/files/security_master/rsyncd.conf
+++ b/modules/roles/files/security_master/rsyncd.conf
@@ -11,15 +11,8 @@ log file = /var/log/rsyncd/rsyncd.log
   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
-  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
 
 [debian-security-buildd-dists]
@@ -28,4 +21,14 @@ log file = /var/log/rsyncd/rsyncd.log
   read only = true
   list = no
   auth users = *
-  secrets file = /etc/rsyncd/buildd.secrets
+  secrets file = /home/archvsync/rsyncd/debian-security-buildd-dists.secrets
+  strict modes = false
+
+[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 = /home/archvsync/rsyncd/debian-security-buildd-pool.secrets
+  strict modes = false