X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fstatic-vhost.conf.erb;h=9a3e83c1925c72a8ac88fdcce9cee31c2fd7e94f;hb=faf0b00a7b3ef90757b7fcf9dec93c9987383f8a;hp=5b2eb4db3d20f06fb7708568e1baee695cb46e87;hpb=27e5ca03d936794fba94a521de8cf93148a7cb31;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 5b2eb4db3..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
 <Macro common-dsa-vhost-https-redirect $name>
-	<VirtualHost <%= vhost_listen %> >
+	<VirtualHost <%= @vhost_listen %> >
 		ServerName $name
 		ServerAdmin debian-admin@lists.debian.org
 
@@ -27,7 +27,7 @@
 		Require all granted
 	</Directory>
 
-	Header set Surrogate-Key <%= hostname %>
+	Header set Surrogate-Key <%= @hostname %>
 
 	AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
 
@@ -35,7 +35,7 @@
 </Macro>
 
 <Macro static-vhost-plain-$name>
-	<VirtualHost <%= vhost_listen %>>
+	<VirtualHost <%= @vhost_listen %>>
 		ServerName $name
 
 		ErrorLog /var/log/apache2/$name-error.log
@@ -46,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
@@ -57,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