X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ffiles%2Fdakmaster%2Frsyncd.conf;h=7cedf0699ffcbb022a6a17e626b99638155e56ee;hb=b6dd1254a55d3db669f9726c3ebacc9a48148b8e;hp=ec4773ca41b7157eded3154415d775ee7e0e6328;hpb=f78fe2ebc3f173a92f385e5fcea1c26c3c404025;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/files/dakmaster/rsyncd.conf b/modules/roles/files/dakmaster/rsyncd.conf
index ec4773ca4..7cedf0699 100644
--- a/modules/roles/files/dakmaster/rsyncd.conf
+++ b/modules/roles/files/dakmaster/rsyncd.conf
@@ -7,73 +7,49 @@ timeout = 7200
 log file = /var/log/rsyncd/rsyncd.log
 
 [indices]
-  path = /srv/ftp.debian.org/mirror/indices
+  path = /srv/ftp-master.debian.org/mirror/ftp-master/indices
   comment = index files
   auth users = *
   read only = true
   secrets file = /etc/rsyncd/indices.secrets
 
 [ftp]
-  path = /srv/ftp.debian.org/rsync/all
-  comment = Full Debian FTP Archive (~450 GB)
+  path = /srv/ftp-master.debian.org/mirror/ftp-master
+  comment = Full Debian FTP Archive (huge and growing)
   auth users = *
   read only = true
   secrets file = /etc/rsyncd/ftp.secrets
   list = no
 
 [debian-all]
-  path = /srv/ftp.debian.org/rsync/all
-  comment = Full Debian FTP Archive (~450 GB)
+  path = /srv/ftp-master.debian.org/mirror/ftp-master
+  comment = Full Debian FTP Archive (huge and growing)
   auth users = *
   read only = true
   secrets file = /etc/rsyncd/ftp.secrets
   list = no
 
 [debian]
-  path = /srv/ftp.debian.org/rsync/all
-  comment = Full Debian FTP Archive (~450 GB)
+  path = /srv/ftp-master.debian.org/mirror/ftp-master
+  comment = Full Debian FTP Archive (huge and growing)
   auth users = *
   read only = true
   secrets file = /etc/rsyncd/ftp.secrets
 
 [debian-backports]
-  path = /srv/backports-master.debian.org/mirror
+  path = /srv/backports-master.debian.org/mirror/backports
   comment = Debian Squeeze Backports
   auth users = *
   read only = true
   secrets file = /etc/rsyncd/backports.secrets
   list = no
 
-[buildd-unstable]
-  path = /srv/incoming.debian.org/dists/unstable/current/
-  comment = Buildd directory unstable
+[debian-debug]
+  path = /srv/ftp-master.debian.org/mirror/debian-debug
+  comment = Debug packages.  Probably large.  Starting mid 2015.
   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/ftp.secrets
   list = no
 
 [exports]
@@ -83,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
@@ -105,16 +66,8 @@ 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
-  read only = true
-  list = no
-  auth users = *
-  secrets file = /etc/rsyncd/buildd-all.secrets
-
 [debian-buildd-dists]
-  path = /srv/incoming.debian.org/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