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

diff --git a/modules/roles/files/dakmaster/rsyncd.conf b/modules/roles/files/dakmaster/rsyncd.conf
index d8d6a5784..687f04328 100644
--- a/modules/roles/files/dakmaster/rsyncd.conf
+++ b/modules/roles/files/dakmaster/rsyncd.conf
@@ -1,106 +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
-
-[buildd-unstable]
-  path = /srv/incoming.debian.org/dists/unstable/current/
-  comment = Buildd directory unstable
+  path = /srv/ftp-master.debian.org/mirror/ftp-master
   auth users = *
-  read only = true
-  secrets file = /etc/rsyncd/buildd.secrets
-  list = no
+  secrets file = /home/archvsync/rsyncd/debian.secrets
 
-[buildd-sid]
-  path = /srv/incoming.debian.org/dists/unstable/current/
-  comment = Buildd directory unstable
+[debian-debug]
+  path = /srv/ftp-master.debian.org/mirror/debian-debug
   auth users = *
-  read only = true
-  secrets file = /etc/rsyncd/buildd.secrets
-  list = no
+  secrets file = /home/archvsync/rsyncd/debian-debug.secrets
 
-[buildd-experimental]
-  path = /srv/incoming.debian.org/dists/experimental/current/
-  comment = Buildd directory experimental
+[buildd-keyrings]
+  path = /srv/ftp-master.debian.org/scripts/builddkeyrings/keyrings
   auth users = *
-  read only = true
-  secrets file = /etc/rsyncd/buildd.secrets
-  list = no
+  secrets file = /home/archvsync/rsyncd/buildd-keyrings.secrets
 
-[buildd-rc-buggy]
-  path = /srv/incoming.debian.org/dists/experimental/current/
-  comment = Buildd directory experimental
+[debian-buildd-dists]
+  path = /srv/static.debian.org/master/incoming.debian.org-current-live/debian-buildd/dists
   auth users = *
-  read only = true
-  secrets file = /etc/rsyncd/buildd.secrets
-  list = no
+  secrets file = /home/archvsync/rsyncd/debian-buildd-dists.secrets
 
-[exports]
-  path = /srv/ftp.debian.org/rsync/export
-  comment = Various metadata exports
+[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 = *
-  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
-  read only = true
-  list = no
-  hosts allow = 82.195.75.106, 2001:41b8:202:deb:216:36ff:fe40:3906
+  secrets file = /home/archvsync/rsyncd/debian-buildd.secrets
 
-[buildd-all]
-  path = /srv/incoming.debian.org/dists/
-  comment = buildd tree sync for geodns
-  read only = true
-  list = no
+[debian-archive]
+  comment = Debian Historical Archives (use -H to save space)
+  path = /srv/archive.debian.org/debian-archive
   auth users = *
-  secrets file = /etc/rsyncd/buildd-all.secrets
+  secrets file = /home/archvsync/rsyncd/debian-archive.secrets