X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fsyncproxy%2Fsyncproxy.debian.org-apache.erb;h=de01c02a5b2a03764bf0f87176a286915e536763;hb=f97bd2a2a0cccb68e4de5e8cca2ebaebab0ab153;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..de01c02a5 100644
--- a/modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb
+++ b/modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb
@@ -4,17 +4,25 @@
 ##
 
 <%
-  vhost_listen = [ (bind != '') ? "#{bind}:80" : "*:80",  (bind6 != '') ? "#{bind6}:80" : "*:80"].uniq.join(' ')
-  vhost_listen_443 = [ (bind != '') ? "#{bind}:443" : "*:443",  (bind6 != '') ? "#{bind6}:443" : "*:443"].uniq.join(' ')
+  vhost_listen = [ (bind != '') ? "#{bind}" : "*",  (bind6 != '') ? "#{bind6}" : "*"].uniq
+  vhost_listen_443 = [ (bind != '') ? "#{bind}:443" : "*:443",  (bind6 != '') ? "[#{bind6}]:443" : "*:443"].uniq
 %>
 
-Use common-debian-service-https-redirect "<%= vhost_listen %>" <%= syncproxy_name %>
-<Virtualhost <%= vhost_listen_443 %> >
+<%=
+lines = []
+vhost_listen.each do |bind|
+   lines << "Use common-debian-service-https-redirect \"#{bind}\" \"#{syncproxy_name}\""
+end
+lines.join("\n")
+
+%>
+<Virtualhost <%= vhost_listen_443.join(' ') %> >
    ServerName <%= syncproxy_name %>
    DocumentRoot /srv/www/syncproxy.debian.org/htdocs
 
    Use common-debian-service-ssl <%= syncproxy_name %>
    Use common-ssl-HSTS
+   Use http-pkp-<%= syncproxy_name %>
 
    <Directory /srv/www/syncproxy.debian.org/htdocs>
       Require all granted
@@ -25,13 +33,12 @@ 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/"
     lines << "  <Directory /srv/mirrors/#{archive}/project/trace/>"
     lines << "    Require all granted"
-    lines << "    IndexOptions NameWidth=* +SuppressDescription"
     lines << "    Options +Indexes"
     lines << "  </Directory>"
   end