Use the leap-seconds.list file from tzdata on jessie (see #775166)

[mirror/dsa-puppet.git] / modules / roles / templates / static-mirroring / static-vhost.conf.erb

diff --git a/modules/roles/templates/static-mirroring/static-vhost.conf.erb b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
index 58cfb1d..b265074 100644 (file)
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -11,6 +11,18 @@
        </VirtualHost>
 </Macro>
 
+<Macro common-dsa-vhost-https-redirect-temp $name>
+       <VirtualHost <%= vhost_listen %> >
+               ServerName $name
+               ServerAdmin debian-admin@lists.debian.org
+
+               CustomLog /var/log/apache2/$name-access.log privacy
+               ErrorLog /var/log/apache2/$name-error.log
+
+               Redirect / https://$name/
+       </VirtualHost>
+</Macro>
+
 <Macro common-static-base $name>
        <IfModule mod_userdir.c>
                UserDir disabled
@@ -25,6 +37,8 @@
                Allow from all
        </Directory>
 
+       Header set Surrogate-Key <%= hostname %>
+
        DefaultType text/plain
        AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
 </Macro>