Move archvsync_base from FTP to debian_mirror

[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 7202edc..5b2eb4d 100644 (file)
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -24,7 +24,6 @@
        <Directory /srv/static.debian.org/mirrors/$name/cur>
                AllowOverride FileInfo Indexes Options=Multiviews
                Options Indexes SymLinksIfOwnerMatch
-               IndexOptions FancyIndexing NameWidth=*
                Require all granted
        </Directory>
 
@@ -36,7 +35,7 @@
 </Macro>
 
 <Macro static-vhost-plain-$name>
-       <VirtualHost *:80>
+       <VirtualHost <%= vhost_listen %>>
                ServerName $name
 
                ErrorLog /var/log/apache2/$name-error.log
@@ -47,7 +46,7 @@
 </Macro>
 
 <Macro static-vhost-onion-$name $onion>
-       <VirtualHost *:80>
+       <VirtualHost <%= vhost_listen %>>
                ServerName $onion
 
                ErrorLog /var/log/apache2/$name-error.log
@@ -58,7 +57,7 @@
 </Macro>
 
 <Macro static-vhost-ssl-$name>
-       <VirtualHost *:443>
+       <VirtualHost <%= vhost_listen_443 %>>
                ServerName $name
 
                ErrorLog /var/log/apache2/$name-error.log
@@ -66,6 +65,7 @@
 
                Use common-debian-service-ssl $name
                Use common-ssl-HSTS
+               Use http-pkp-$name
 
                Use static-vhost-base-$name
        </VirtualHost>