Enable rsync-ssl on keyring.debian.org

[mirror/dsa-puppet.git] / modules / roles / templates / syncproxy / rsyncd.conf.erb

diff --git a/modules/roles/templates/syncproxy/rsyncd.conf.erb b/modules/roles/templates/syncproxy/rsyncd.conf.erb
index a3732f0..39673a7 100644 (file)
--- a/modules/roles/templates/syncproxy/rsyncd.conf.erb
+++ b/modules/roles/templates/syncproxy/rsyncd.conf.erb
@@ -6,34 +6,34 @@ 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]
-  path = /srv/mirrors/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 -%>
-  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