X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ffiles%2Fdakmaster%2Frsyncd.conf;h=6f67db92e2f95d821a9f1ef809306be8a4734b97;hb=08a5df3e8e1957dbc22e97f80e13861b4865aacd;hp=f7f8f3c2bd420a9126282b727c840e1dc20c3016;hpb=0fe7624b0c747dda85c88b7de4ab857c0a2d6798;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/files/dakmaster/rsyncd.conf b/modules/roles/files/dakmaster/rsyncd.conf
index f7f8f3c2b..6f67db92e 100644
--- a/modules/roles/files/dakmaster/rsyncd.conf
+++ b/modules/roles/files/dakmaster/rsyncd.conf
@@ -7,64 +7,34 @@ 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)
-  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)
-  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
 
-[exports]
-  path = /srv/ftp.debian.org/rsync/export
-  comment = Various metadata exports
+[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/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
+  secrets file = /etc/rsyncd/ftp.secrets
+  list = no
 
 [buildd-keyrings]
   path = /srv/ftp-master.debian.org/scripts/builddkeyrings/keyrings