add back our git reversion

[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 584b5bc..5b2eb4d 100644 (file)
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -1,6 +1,20 @@
 # puppet maintained
+<Macro common-dsa-vhost-https-redirect $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>
+</Macro>
+
+<Macro prepare-static-vhost $name>
+<Macro static-vhost-base-$name>
+       ServerAdmin debian-admin@lists.debian.org
 
-<Macro common-static-base $name>
        <IfModule mod_userdir.c>
                UserDir disabled
        </IfModule>
@@ -8,49 +22,54 @@
 
        DocumentRoot /srv/static.debian.org/mirrors/$name/cur
        <Directory /srv/static.debian.org/mirrors/$name/cur>
-               AllowOverride FileInfo
-               Options Multiviews Indexes FollowSymLinks
-               IndexOptions FancyIndexing NameWidth=*
-               Order allow,deny
-               Allow from all
+               AllowOverride FileInfo Indexes Options=Multiviews
+               Options Indexes SymLinksIfOwnerMatch
+               Require all granted
        </Directory>
 
-       DefaultType text/plain
+       Header set Surrogate-Key <%= hostname %>
+
        AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
-</Macro>
 
+       Use vstatic-vhost-extra-$name
+</Macro>
 
-<Macro common-static-vhost-with-extra $name $extra>
-       <Virtualhost <%= vhost_listen %> >
+<Macro static-vhost-plain-$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
 
-               Use common-static-base $name
-               $extra
+               Use static-vhost-base-$name
        </VirtualHost>
 </Macro>
 
-<Macro common-static-vhost-publiclog $name>
-       <Virtualhost <%= vhost_listen %> >
-               ServerName $name
-               ServerAdmin debian-admin@lists.debian.org
+<Macro static-vhost-onion-$name $onion>
+       <VirtualHost <%= vhost_listen %>>
+               ServerName $onion
 
                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>
 
-               Use common-static-base $name
+               Use static-vhost-base-$name
        </VirtualHost>
 </Macro>
 
-<Macro common-static-vhost $name>
-       Use common-static-vhost-with-extra $name "# nada"
-</Macro>
+<Macro static-vhost-ssl-$name>
+       <VirtualHost <%= vhost_listen_443 %>>
+               ServerName $name
 
+               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 http-pkp-$name
+
+               Use static-vhost-base-$name
+       </VirtualHost>
+</Macro>
+</Macro>
 
 # vim:ft=apache: