add ssh-wrapper + userkeys config for buildd rsync uploads

[mirror/dsa-puppet.git] / modules / roles / files / dakmaster / rsyncd.conf

diff --git a/modules/roles/files/dakmaster/rsyncd.conf b/modules/roles/files/dakmaster/rsyncd.conf
index d8d6a57..f7f8f3c 100644 (file)
--- a/modules/roles/files/dakmaster/rsyncd.conf
+++ b/modules/roles/files/dakmaster/rsyncd.conf
@@ -36,36 +36,12 @@ log file = /var/log/rsyncd/rsyncd.log
   read only = true
   secrets file = /etc/rsyncd/ftp.secrets
 
-[buildd-unstable]
-  path = /srv/incoming.debian.org/dists/unstable/current/
-  comment = Buildd directory unstable
+[debian-backports]
+  path = /srv/backports-master.debian.org/mirror
+  comment = Debian Squeeze Backports
   auth users = *
   read only = true
-  secrets file = /etc/rsyncd/buildd.secrets
-  list = no
-
-[buildd-sid]
-  path = /srv/incoming.debian.org/dists/unstable/current/
-  comment = Buildd directory unstable
-  auth users = *
-  read only = true
-  secrets file = /etc/rsyncd/buildd.secrets
-  list = no
-
-[buildd-experimental]
-  path = /srv/incoming.debian.org/dists/experimental/current/
-  comment = Buildd directory experimental
-  auth users = *
-  read only = true
-  secrets file = /etc/rsyncd/buildd.secrets
-  list = no
-
-[buildd-rc-buggy]
-  path = /srv/incoming.debian.org/dists/experimental/current/
-  comment = Buildd directory experimental
-  auth users = *
-  read only = true
-  secrets file = /etc/rsyncd/buildd.secrets
+  secrets file = /etc/rsyncd/backports.secrets
   list = no
 
 [exports]
@@ -97,10 +73,10 @@ log file = /var/log/rsyncd/rsyncd.log
   list = no
   hosts allow = 82.195.75.106, 2001:41b8:202:deb:216:36ff:fe40:3906
 
-[buildd-all]
-  path = /srv/incoming.debian.org/dists/
-  comment = buildd tree sync for geodns
+[debian-buildd-dists]
+  path = /srv/static.debian.org/master/incoming.debian.org-current-live/debian-buildd/dists
+  comment = buildd archive
   read only = true
   list = no
   auth users = *
-  secrets file = /etc/rsyncd/buildd-all.secrets
+  secrets file = /etc/rsyncd/buildd.secrets