X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fstatic-vhost.conf.erb;h=5b2eb4db3d20f06fb7708568e1baee695cb46e87;hb=836eff39ec561176cd00cc2d7b4e66e9668a25ee;hp=7202edcebf435b9fade9ca48fb076d13e4062518;hpb=fa63526cb7a7dfc0abb51c0bbfacbd046a21dd91;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/templates/static-mirroring/static-vhost.conf.erb b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
index 7202edceb..5b2eb4db3 100644
--- 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>