Note that exim contains tracker-specific configuration

[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 6b857fc..9a3e83c 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,6 @@
 # puppet maintained
 <Macro common-dsa-vhost-https-redirect $name>
-       <VirtualHost <%= vhost_listen %> >
+       <VirtualHost <%= @vhost_listen %> >
                ServerName $name
                ServerAdmin debian-admin@lists.debian.org
 
@@ -11,19 +11,10 @@
        </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
+<Macro prepare-static-vhost $name>
+<Macro static-vhost-base-$name>
+       ServerAdmin debian-admin@lists.debian.org
 
-               Redirect / https://$name/
-       </VirtualHost>
-</Macro>
-
-<Macro common-static-base $name>
        <IfModule mod_userdir.c>
                UserDir disabled
        </IfModule>
@@ -33,54 +24,52 @@
        <Directory /srv/static.debian.org/mirrors/$name/cur>
                AllowOverride FileInfo Indexes Options=Multiviews
                Options Indexes SymLinksIfOwnerMatch
-               IndexOptions FancyIndexing NameWidth=*
-               <% if @lsbmajdistrelease > '7' -%>
-                       Require all granted
-               <% else -%>
-                       Order allow,deny
-                       Allow from all
-               <% end -%>
+               Require all granted
        </Directory>
 
-       Header set Surrogate-Key <%= hostname %>
+       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 $name>
-       Use common-static-vhost-with-extra $name "# nada"
-</Macro>
+<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
 
-<Macro common-static-vhost-ssl $name>
-       Use common-dsa-vhost-https-redirect $name
+               Use static-vhost-base-$name
+       </VirtualHost>
+</Macro>
 
-       <Virtualhost <%= vhost_listen_443 %> >
+<Macro static-vhost-ssl-$name>
+       <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 http-pkp-$name
 
-               Use common-static-base $name
+               Use static-vhost-base-$name
        </VirtualHost>
 </Macro>
+</Macro>
 
 # vim:ft=apache: