From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 5 Aug 2016 18:10:18 +0000 (+0000)
Subject: fix virtual host binds
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=a54fc8c09027aebe5a314c40e663241de378865d;p=mirror%2Fdsa-puppet.git

fix virtual host binds
---

diff --git a/modules/roles/templates/static-mirroring/static-vhost.conf.erb b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
index 7202edceb..26108117a 100644
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -36,7 +36,7 @@
 </Macro>
 
 <Macro static-vhost-plain-$name>
-	<VirtualHost *:80>
+	<VirtualHost <%= vhost_listen %>>
 		ServerName $name
 
 		ErrorLog /var/log/apache2/$name-error.log
@@ -47,7 +47,7 @@
 </Macro>
 
 <Macro static-vhost-onion-$name $onion>
-	<VirtualHost *:80>
+	<VirtualHost <%= vhost_listen %>>
 		ServerName $onion
 
 		ErrorLog /var/log/apache2/$name-error.log
@@ -58,7 +58,7 @@
 </Macro>
 
 <Macro static-vhost-ssl-$name>
-	<VirtualHost *:443>
+	<VirtualHost <%= vhost_listen_443 %>>
 		ServerName $name
 
 		ErrorLog /var/log/apache2/$name-error.log