More complex bits.debian.org config

[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 584b5bcc199047326a9d1b41374b5b394b36ad40..5e3fe41db0fd37ec18383cd078bec745597ab7ae 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
@@ -33,24 +32,34 @@
        </VirtualHost>
 </Macro>
 
-<Macro common-static-vhost-publiclog $name>
-       <Virtualhost <%= vhost_listen %> >
+<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
 
-               ErrorLog /var/log/apache2/$name-error.log
                CustomLog /var/log/apache2/$name-access.log privacy
-               <IfModule mod_geoip.c>
-                       CustomLog /var/log/apache2/$name-public-access.log privacy+geo
-               </IfModule>
+               ErrorLog /var/log/apache2/$name-error.log
 
-               Use common-static-base $name
+               Redirect permanent / https://$name/
        </VirtualHost>
-</Macro>
 
-<Macro common-static-vhost $name>
-       Use common-static-vhost-with-extra $name "# nada"
-</Macro>
+       <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: