From fbe56e4206801c65dae31a524d1af8665ead5714 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Thu, 26 May 2016 22:34:32 +0200 Subject: [PATCH] Add more -ports stuff --- modules/debian-org/lib/facter/paths.rb | 1 + .../static-mirroring/vhost/static-vhosts-simple.erb | 1 + modules/roles/templates/syncproxy/rsyncd.conf.erb | 10 ++++++++++ .../syncproxy/syncproxy.debian.org-apache.erb | 2 +- .../syncproxy/syncproxy.debian.org-index.html.erb | 2 +- 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/modules/debian-org/lib/facter/paths.rb b/modules/debian-org/lib/facter/paths.rb index 6b1b3da4d..47a010ce8 100644 --- 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 0722bb171..d971eca16 100644 --- 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 @@ 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/ <% end -%> diff --git a/modules/roles/templates/syncproxy/rsyncd.conf.erb b/modules/roles/templates/syncproxy/rsyncd.conf.erb index dd348e43f..d144ccc72 100644 --- 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 fa910c1ce..0fc7f79ec 100644 --- 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 f1be122cf..062731ee9 100644 --- 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.