use privacyssl as the log format in two places

[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 d171ff6ad712cbbce0b6fa15c7843de7f711a58d..e398e5bf008b66b843308d6ff4f8b2de1f8a93c3 100644 (file)
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -8,8 +8,7 @@
 
        DocumentRoot /srv/static.debian.org/mirrors/$name/cur
        <Directory /srv/static.debian.org/mirrors/$name/cur>
-               AllowOverride FileInfo
-               Options Multiviews Indexes FollowSymLinks
+               AllowOverride FileInfo Indexes Options=Multiviews
                IndexOptions FancyIndexing NameWidth=*
                Order allow,deny
                Allow from all
@@ -30,7 +29,6 @@
 
                Use common-static-base $name
                $extra
-               DefaultType text/plain
        </VirtualHost>
 </Macro>
 
@@ -46,7 +44,6 @@
                </IfModule>
 
                Use common-static-base $name
-               DefaultType text/plain
        </VirtualHost>
 </Macro>
 
@@ -55,4 +52,29 @@
 </Macro>
 
 
+<Macro common-static-vhost-ssl $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 permanent / https://$name/
+       </VirtualHost>
+
+       <Virtualhost <%= vhost_listen_443 %> >
+               ServerName $name
+               ServerAdmin debian-admin@lists.debian.org
+
+               ErrorLog /var/log/apache2/$name-error.log
+               CustomLog /var/log/apache2/$name-access.log privacyssl
+
+               Use common-debian-service-ssl $name
+               Use common-ssl-HSTS
+
+               Use common-static-base $name
+       </VirtualHost>
+</Macro>
+
 # vim:ft=apache: