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

diff --git a/modules/roles/files/dakmaster/rsyncd.conf b/modules/roles/files/dakmaster/rsyncd.conf
index ffc128ce5..687f04328 100644
--- a/modules/roles/files/dakmaster/rsyncd.conf
+++ b/modules/roles/files/dakmaster/rsyncd.conf
@@ -1,75 +1,49 @@
 uid = nobody
 gid = nogroup
-max connections = 25
 syslog facility = daemon
 socket options = SO_KEEPALIVE
+reverse lookup = false
 timeout = 7200
 log file = /var/log/rsyncd/rsyncd.log
 
+list = no
+read only = true
+ignore nonreadable = true
+strict modes = false
+
 [indices]
-  path = /srv/ftp.debian.org/mirror/indices
-  comment = index files
+  path = /srv/ftp-master.debian.org/mirror/ftp-master/indices
   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)
-  auth users = *
-  read only = true
-  secrets file = /etc/rsyncd/ftp.secrets
-
-[debian-backports]
-  path = /srv/backports-master.debian.org/mirror
-  comment = Debian Squeeze Backports
+  path = /srv/ftp-master.debian.org/mirror/ftp-master
   auth users = *
-  read only = true
-  secrets file = /etc/rsyncd/backports.secrets
-  list = no
+  secrets file = /home/archvsync/rsyncd/debian.secrets
 
 [debian-debug]
-  path = /srv/ftp-master.debian.org/archive/debian-debug
-  comment = Debug packages.  Probably large.  Starting mid 2015.
+  path = /srv/ftp-master.debian.org/mirror/debian-debug
   auth users = *
-  read only = true
-  secrets file = /etc/rsyncd/ftp.secrets
-  list = no
-
-[exports]
-  path = /srv/ftp.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-debug.secrets
 
 [buildd-keyrings]
   path = /srv/ftp-master.debian.org/scripts/builddkeyrings/keyrings
-  comment = buildd keys for archive uploads
-  read only = true
-  list = no
-  hosts allow = 82.195.75.106, 2001:41b8:202:deb:216:36ff:fe40:3906
+  auth users = *
+  secrets file = /home/archvsync/rsyncd/buildd-keyrings.secrets
 
 [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.secrets
+  secrets file = /home/archvsync/rsyncd/debian-buildd-dists.secrets
+
+[debian-buildd]
+  comment = debian-buildd tree.  Not staged, or synced, or necessarily consistent.  Only use for speeding up subsequent syncs of the debian archive.
+  path = /srv/ftp-master.debian.org/public/incoming.debian.org/web/debian-buildd
+  auth users = *
+  secrets file = /home/archvsync/rsyncd/debian-buildd.secrets
+
+[debian-archive]
+  comment = Debian Historical Archives (use -H to save space)
+  path = /srv/archive.debian.org/debian-archive
+  auth users = *
+  secrets file = /home/archvsync/rsyncd/debian-archive.secrets