X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fsyncproxy%2Fsyncproxy.debian.org-apache.erb;h=bebc6be319bdfe4f05aacd3c26041d44af12c603;hb=7f18f21c8a9d538bac4a1ae874b492a80f432623;hp=9367e8e735f92818ee8a8a6855e011882d365a56;hpb=16b81b98fef3338c96fa656a095b564a6542cb52;p=mirror%2Fdsa-puppet.git diff --git a/modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb b/modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb index 9367e8e73..bebc6be31 100644 --- a/modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb +++ b/modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb @@ -15,6 +15,7 @@ Use common-debian-service-https-redirect "<%= vhost_listen %>" <%= syncproxy_nam Use common-debian-service-ssl <%= syncproxy_name %> Use common-ssl-HSTS + Use http-pkp-<%= syncproxy_name %> Require all granted @@ -25,7 +26,7 @@ Use common-debian-service-https-redirect "<%= vhost_listen %>" <%= syncproxy_nam <%= lines = [] -%w{debian debian-backports 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/"