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=eec5a60952459bb36e242d1eada71d75e7b628c6;hp=db525133fe0b1406aa64cf08a743ce014c79c8ff;hpb=8f515ddb04dacc7c5ccb304639aefe6b6c7f921e;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 db525133f..bebc6be31 100644
--- a/modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb
+++ b/modules/roles/templates/syncproxy/syncproxy.debian.org-apache.erb
@@ -5,12 +5,18 @@
 
 <%
   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(' ')
 %>
 
-<Virtualhost <%= vhost_listen %> >
+Use common-debian-service-https-redirect "<%= vhost_listen %>" <%= syncproxy_name %>
+<Virtualhost <%= vhost_listen_443 %> >
    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
    </Directory>
@@ -20,7 +26,7 @@
 
 <%=
 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/"