X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ffiles%2Fdakmaster%2Frsyncd.conf;h=ffc128ce51aae574d635e4b9415f993ccc427860;hb=733d6e2a787803dcf21e5dab583ce811bdefba7d;hp=d8d6a57846a1a8cfaea3f057cad0fde554aa5ea7;hpb=650335318c9021ace96b0cb6d49a13c1a472271f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/files/dakmaster/rsyncd.conf b/modules/roles/files/dakmaster/rsyncd.conf
index d8d6a5784..ffc128ce5 100644
--- a/modules/roles/files/dakmaster/rsyncd.conf
+++ b/modules/roles/files/dakmaster/rsyncd.conf
@@ -36,36 +36,20 @@ 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
+  secrets file = /etc/rsyncd/backports.secrets
   list = no
 
-[buildd-experimental]
-  path = /srv/incoming.debian.org/dists/experimental/current/
-  comment = Buildd directory experimental
+[debian-debug]
+  path = /srv/ftp-master.debian.org/archive/debian-debug
+  comment = Debug packages.  Probably large.  Starting mid 2015.
   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/ftp.secrets
   list = no
 
 [exports]
@@ -75,21 +59,6 @@ log file = /var/log/rsyncd/rsyncd.log
   read only = true
   secrets file = /etc/rsyncd/exports.secrets
 
-# disabled 20091024 RT#1864
-#[debian]
-#  path = /srv/ftp.debian.org/rsync/typical
-#  comment = Typical Debian FTP Archive (~150 GB)
-#  auth users = *
-#  read only = true
-#  secrets file = /etc/rsyncd/ftp.secrets
-#
-#[debian-all+typical]
-#  path = /srv/ftp.debian.org/rsync/all+typical
-#  comment = Debian 'all' and 'typical' FTP Archive (NB: use rsync with -H)
-#  auth users = *
-#  read only = true
-#  secrets file = /etc/rsyncd/ftp.secrets
-
 [buildd-keyrings]
   path = /srv/ftp-master.debian.org/scripts/builddkeyrings/keyrings
   comment = buildd keys for archive uploads
@@ -97,10 +66,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