X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fsyncproxy%2Frsyncd.conf.erb;h=f9381f1c8388a5f1a055acc72d2b88a3f59ca87b;hb=27e5ca03d936794fba94a521de8cf93148a7cb31;hp=fa0d12533d95e86a76a845330da26ac371f7c1a6;hpb=202b87189e88965b05bbca2431abb3294fd5c301;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/templates/syncproxy/rsyncd.conf.erb b/modules/roles/templates/syncproxy/rsyncd.conf.erb
index fa0d12533..f9381f1c8 100644
--- a/modules/roles/templates/syncproxy/rsyncd.conf.erb
+++ b/modules/roles/templates/syncproxy/rsyncd.conf.erb
@@ -6,45 +6,45 @@ socket options = SO_KEEPALIVE
 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" -%>
   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 == "true" -%>
   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]
+[debian-ports]
+  path = /srv/mirrors/debian-ports/
 <%- unless has_variable?("has_srv_mirrors_debian_debug") && has_srv_mirrors_debian_debug == "true" -%>
   list = no
 <%- end -%>
-  path = /srv/mirrors/debian-debug/
-  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" -%>
   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