X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fsyncproxy%2Frsyncd.conf.erb;h=39673a70e0cd059933e0a52e5e9564d9511473d8;hb=7f18f21c8a9d538bac4a1ae874b492a80f432623;hp=832ad9e831fb308c0e4eaa1076fd9c6ef64b3f1f;hpb=e8cc4e5ea21d4f9204b72ef831257556b81203f1;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/templates/syncproxy/rsyncd.conf.erb b/modules/roles/templates/syncproxy/rsyncd.conf.erb
index 832ad9e83..39673a70e 100644
--- a/modules/roles/templates/syncproxy/rsyncd.conf.erb
+++ b/modules/roles/templates/syncproxy/rsyncd.conf.erb
@@ -6,43 +6,43 @@ 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
 
 [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 = Full Debian FTP 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
 
-[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.  Probably large.  Starting end of 2015.
   auth users = *
   read only = true
   secrets file = /etc/rsyncd/debian.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 tree - see https://www.ports.debian.org/
   auth users = *
   read only = true
   secrets file = /etc/rsyncd/debian.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 -%>
-  path = /srv/mirrors/debian-security/
   comment = Debian security archive (~100 GB; contact mirrors@debian.org for access)
   auth users = *
   read only = true