X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fsyncproxy%2Frsyncd.conf.erb;h=14a6d07186891ee7a1e42d6d661566916e8ade7b;hb=e2768b13344b149e62d256f7efbcee923e4e6e3d;hp=a3732f0e19e34df0f2f3b7bcae70d9c41487aecd;hpb=83050f78ad34306d2f379400c00cbdc80ac13d6e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/templates/syncproxy/rsyncd.conf.erb b/modules/roles/templates/syncproxy/rsyncd.conf.erb
index a3732f0e1..14a6d0718 100644
--- a/modules/roles/templates/syncproxy/rsyncd.conf.erb
+++ b/modules/roles/templates/syncproxy/rsyncd.conf.erb
@@ -1,50 +1,55 @@
 uid = nobody
 gid = nogroup
-max connections = 30
 syslog facility = daemon
 socket options = SO_KEEPALIVE
+reverse lookup = false
 timeout = 7200
 
 # weasel 2007-11-19
-log file =  /var/log/rsyncd/rsyncd.log
+log file =  /var/log/rsyncd/rsyncd-syncproxy.log
+
+read only = true
+ignore nonreadable = true
+strict modes = false
 
 [debian]
   path = /srv/mirrors/debian/
-<%- unless has_variable?("has_srv_mirrors_debian") && has_srv_mirrors_debian == "true" -%>
+<%- unless has_variable?("has_srv_mirrors_debian") && @has_srv_mirrors_debian -%>
   list = no
 <%- end -%>
-  comment = Full Debian FTP Archive (~1.5 TB as of 2015; contact mirrors@debian.org for access)
+  comment = Debian archive (contact mirrors@debian.org for access; see https://www.debian.org/mirror/size for size)
   auth users = *
-  read only = true
-  secrets file = /etc/rsyncd/debian.secrets
+  secrets file = /home/archvsync/rsyncd/debian.secrets
 
-[debian-backports]
-  path = /srv/mirrors/debian-backports/
-<%- unless has_variable?("has_srv_mirrors_debian_backports") && has_srv_mirrors_debian_backports == "true" -%>
+[debian-debug]
+  path = /srv/mirrors/debian-debug/
+<%- unless has_variable?("has_srv_mirrors_debian_debug") && @has_srv_mirrors_debian_debug -%>
   list = no
 <%- end -%>
-  comment = Debian backports archive (up to, including Debian 6.0(squeeze) - ~35 GB; contact mirrors@debian.org for access)
+  comment = Debug packages for Debian archive (contact mirrors@debian.org for access)
   auth users = *
-  read only = true
-  secrets file = /etc/rsyncd/debian.secrets
+  secrets file = /home/archvsync/rsyncd/debian-debug.secrets
 
-[debian-debug]
-  path = /srv/mirrors/debian-debug/
-<%- unless has_variable?("has_srv_mirrors_debian_debug") && has_srv_mirrors_debian_debug == "true" -%>
+[debian-ports]
+  path = /srv/mirrors/debian-ports/
+<%- unless has_variable?("has_srv_mirrors_debian_debug") && @has_srv_mirrors_debian_debug -%>
   list = no
 <%- end -%>
-  comment = Debug packages.  Probably large.  Starting end of 2015.
+  comment = Debian ports archive (contact mirrors@debian.org for access)
   auth users = *
-  read only = true
-  secrets file = /etc/rsyncd/debian.secrets
+  secrets file = /home/archvsync/rsyncd/debian-ports.secrets
 
 [debian-security]
   path = /srv/mirrors/debian-security/
-<%- unless has_variable?("has_srv_mirrors_debian_security") && has_srv_mirrors_debian_security == "true" -%>
+<%- unless has_variable?("has_srv_mirrors_debian_security") && @has_srv_mirrors_debian_security -%>
   list = no
 <%- end -%>
-  comment = Debian security archive (~100 GB; contact mirrors@debian.org for access)
+  comment = Debian security archive (contact mirrors@debian.org for access)
   auth users = *
-  read only = true
-  secrets file = /etc/rsyncd/debian.secrets
+  secrets file = /home/archvsync/rsyncd/debian-security.secrets
 
+[debian-security-buildd-pool]
+  path = /srv/mirrors/debian-security-buildd/pool/
+  list = no
+  auth users = *
+  secrets file = /home/archvsync/rsyncd/debian-security-buildd-pool.secrets