X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=inline;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fstatic-vhost.conf.erb;h=9a3e83c1925c72a8ac88fdcce9cee31c2fd7e94f;hb=e223cc6541f3d038e37352a0fac74010bd7ca624;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..9a3e83c19 100644
--- 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
- >
+ >
ServerName $name
ServerAdmin debian-admin@lists.debian.org
@@ -24,11 +24,10 @@
AllowOverride FileInfo Indexes Options=Multiviews
Options Indexes SymLinksIfOwnerMatch
- IndexOptions FancyIndexing NameWidth=*
Require all granted
- Header set Surrogate-Key <%= hostname %>
+ Header set Surrogate-Key <%= @hostname %>
AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
@@ -36,7 +35,7 @@
-
+ >
ServerName $name
ErrorLog /var/log/apache2/$name-error.log
@@ -47,7 +46,7 @@
-
+ >
ServerName $onion
ErrorLog /var/log/apache2/$name-error.log
@@ -58,7 +57,7 @@
-
+ >
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