Add more -ports stuff

diff --git a/modules/debian-org/lib/facter/paths.rb b/modules/debian-org/lib/facter/paths.rb
index 6b1b3da..47a010c 100644 (file)
--- a/modules/debian-org/lib/facter/paths.rb
+++ b/modules/debian-org/lib/facter/paths.rb
@@ -4,6 +4,7 @@
    /etc/ssh/ssh_host_ed25519_key
    /srv/mirrors/debian
    /srv/mirrors/debian-debug
+   /srv/mirrors/debian-ports
    /srv/mirrors/debian-security
    /dev/hwrng
 }.each do |path|

diff --git a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
index 0722bb1..d971eca 100644 (file)
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -6,6 +6,7 @@
 <Macro vhost-deb.debian.org-extra>
        Redirect /debian/           http://cdn-fastly.deb.debian.org/debian/
        Redirect /debian-debug/     http://cdn-fastly.deb.debian.org/debian-debug/
+       Redirect /debian-ports/     http://cdn-fastly.deb.debian.org/debian-ports/
        Redirect /debian-security/  http://cdn-fastly.deb.debian.org/debian-security/
 </Macro>
 <% end -%>

diff --git a/modules/roles/templates/syncproxy/rsyncd.conf.erb b/modules/roles/templates/syncproxy/rsyncd.conf.erb
index dd348e4..d144ccc 100644 (file)
--- a/modules/roles/templates/syncproxy/rsyncd.conf.erb
+++ b/modules/roles/templates/syncproxy/rsyncd.conf.erb
@@ -28,6 +28,16 @@ log file =  /var/log/rsyncd/rsyncd-syncproxy.log
   read only = true
   secrets file = /etc/rsyncd/debian.secrets
 
+[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.
+  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" -%>

diff --git a/modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb b/modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb
index fa910c1..0fc7f79 100644 (file)
--- a/modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb
+++ b/modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb
@@ -25,7 +25,7 @@ Use common-debian-service-https-redirect "<%= vhost_listen %>" <%= syncproxy_nam
 
 <%=
 lines = []
-%w{debian debian-debug debian-security}.each do |archive|
+%w{debian debian-debug debian-ports debian-security}.each do |archive|
   varname = 'has_srv_mirrors_' + archive.gsub(/[\/-]/,'_')
   if has_variable?(varname) and (eval(varname)) == 'true'
     lines << "  Alias /#{archive}/project/trace/ /srv/mirrors/#{archive}/project/trace/"

diff --git a/modules/roles/templates/syncproxy/syncproxy.debian.org-index.html.erb b/modules/roles/templates/syncproxy/syncproxy.debian.org-index.html.erb
index f1be122..062731e 100644 (file)
--- a/modules/roles/templates/syncproxy/syncproxy.debian.org-index.html.erb
+++ b/modules/roles/templates/syncproxy/syncproxy.debian.org-index.html.erb
@@ -18,7 +18,7 @@ This syncproxy contains copies of the following archives.
 <ul>
 <%=
 lines = []
-%w{debian debian-debug debian-security}.each do |archive|
+%w{debian debian-debug debian-ports debian-security}.each do |archive|
   varname = 'has_srv_mirrors_' + archive.gsub(/[\/-]/,'_')
   if has_variable?(varname) and (eval(varname)) == 'true'
     lines << "<li>#{archive} [<a href=\"/#{archive}/project/trace/\">trace directory</a>]</li>"