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 4b8640cee89bfab416d4796191c27e00db9c0a36..e398e5bf008b66b843308d6ff4f8b2de1f8a93c3 100644 (file)
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -6,20 +6,20 @@
        </IfModule>
        ServerSignature On
 
-       DocumentRoot /srv/static.debian.org/cur/$name/
-       <Directory /srv/static.debian.org/cur/$name/>
-               AllowOverride FileInfo
-               Options Multiviews Indexes FollowSymLinks
+       DocumentRoot /srv/static.debian.org/mirrors/$name/cur
+       <Directory /srv/static.debian.org/mirrors/$name/cur>
+               AllowOverride FileInfo Indexes Options=Multiviews
                IndexOptions FancyIndexing NameWidth=*
                Order allow,deny
                Allow from all
        </Directory>
 
+       DefaultType text/plain
        AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
 </Macro>
 
 
-<Macro common-static-vhost $name>
+<Macro common-static-vhost-with-extra $name $extra>
        <Virtualhost <%= vhost_listen %> >
                ServerName $name
                ServerAdmin debian-admin@lists.debian.org
@@ -28,6 +28,7 @@
                CustomLog /var/log/apache2/$name-access.log privacy
 
                Use common-static-base $name
+               $extra
        </VirtualHost>
 </Macro>
 
@@ -46,5 +47,34 @@
        </VirtualHost>
 </Macro>
 
+<Macro common-static-vhost $name>
+       Use common-static-vhost-with-extra $name "# nada"
+</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: