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 89f6c3e..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
 
@@ -24,11 +24,10 @@
        <Directory /srv/static.debian.org/mirrors/$name/cur>
                AllowOverride FileInfo Indexes Options=Multiviews
                Options Indexes SymLinksIfOwnerMatch
-               IndexOptions FancyIndexing NameWidth=*
                Require all granted
        </Directory>
 
-       Header set Surrogate-Key <%= hostname %>
+       Header set Surrogate-Key <%= @hostname %>
 
        AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
 
@@ -36,7 +35,7 @@
 </Macro>
 
 <Macro static-vhost-plain-$name>
-       <VirtualHost <%= vhost_listen %>>
+       <VirtualHost <%= @vhost_listen %>>
                ServerName $name
 
                ErrorLog /var/log/apache2/$name-error.log
@@ -47,7 +46,7 @@
 </Macro>
 
 <Macro static-vhost-onion-$name $onion>
-       <VirtualHost <%= vhost_listen %>>
+       <VirtualHost <%= @vhost_listen %>>
                ServerName $onion
 
                ErrorLog /var/log/apache2/$name-error.log
@@ -58,7 +57,7 @@
 </Macro>
 
 <Macro static-vhost-ssl-$name>
-       <VirtualHost <%= vhost_listen_443 %>>
+       <VirtualHost <%= @vhost_listen_443 %>>
                ServerName $name
 
                ErrorLog /var/log/apache2/$name-error.log