X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fsyncproxy%2Frsyncd.conf.erb;h=a33d36da94747b055b007b17390a64e9ce4cdd3d;hb=fec4861e676415e8952b36c308ed40f7ce060fc4;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..a33d36da9 100644
--- a/modules/roles/templates/syncproxy/rsyncd.conf.erb
+++ b/modules/roles/templates/syncproxy/rsyncd.conf.erb
@@ -1,50 +1,58 @@
 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
 
-[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)
-  auth users = *
-  read only = true
-  secrets file = /etc/rsyncd/debian.secrets
+read only = true
+ignore nonreadable = true
+strict modes = false
 
-[debian-backports]
-  path = /srv/mirrors/debian-backports/
-<%- unless has_variable?("has_srv_mirrors_debian_backports") && has_srv_mirrors_debian_backports == "true" -%>
-  list = no
-<%- end -%>
-  comment = Debian backports archive (up to, including Debian 6.0(squeeze) - ~35 GB; contact mirrors@debian.org for access)
-  auth users = *
-  read only = true
-  secrets file = /etc/rsyncd/debian.secrets
+<%=
+ repositories = [
+  { name: 'debian',
+    comment: 'Debian archive (contact mirrors@debian.org for access; see https://www.debian.org/mirror/size for size)',
+  },
+  { name: 'debian-debug',
+    comment: 'Debug packages for Debian archive (contact mirrors@debian.org for access)',
+  },
+  { name: 'debian-ports',
+    comment: 'Debian ports archive (contact mirrors@debian.org for access)',
+  },
+  { name: 'debian-security',
+    comment: 'Debian security archive',
+    list: false,
+  },
+  { name: 'debian-security-buildd-pool',
+    list: false,
+  },
+  { name: 'debian-buildd',
+    list: false,
+  },
+  ]
 
-[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 = Debug packages.  Probably large.  Starting end of 2015.
-  auth users = *
-  read only = true
-  secrets file = /etc/rsyncd/debian.secrets
+  lines = []
 
-[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)
-  auth users = *
-  read only = true
-  secrets file = /etc/rsyncd/debian.secrets
+  repositories.each do |repo|
+    varname = ('has' + @mirror_basedir_prefix + repo[:name]).gsub(/[\/-]/,'_')
+    next unless has_variable?(varname) and (eval("@"+varname))
 
+    lines << "[#{ repo[:name] }]"
+    lines << "  path = #{ @mirror_basedir_prefix }#{ repo[:name] }/"
+    if (repo.include?(:list) and not repo[:list])
+      lines << "  list = no"
+    end
+    if repo.include?(:comment)
+      lines << "  comment = #{ repo[:comment] }"
+    end
+    lines << "  auth users = *"
+    lines << "  secrets file = /home/archvsync/rsyncd/#{ repo[:name] }.secrets"
+    lines << ""
+  end
+
+  lines.join("\n")
+%>