From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 26 Apr 2013 09:36:37 +0000 (+0200)
Subject: Use vhost_listen
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=49223ad1e8bf7a056e780783c3155d9099f88352

Use vhost_listen
---

diff --git a/modules/roles/manifests/www_mirror.pp b/modules/roles/manifests/www_mirror.pp
index 8764e58a..a6c344d2 100644
--- a/modules/roles/manifests/www_mirror.pp
+++ b/modules/roles/manifests/www_mirror.pp
@@ -2,6 +2,7 @@ class roles::www_mirror {
 	# see also static mirrors.
 
 	$wwwdo_document_root = '/srv/www.debian.org/www'
+	$vhost_listen = '*:80'
 	apache2::site { '010-www.debian.org':
 		site   => 'www.debian.org',
 		content => template('roles/apache-www.debian.org.erb'),
diff --git a/modules/roles/templates/apache-www.debian.org.erb b/modules/roles/templates/apache-www.debian.org.erb
index 7073f96d..118ce801 100644
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -86,7 +86,7 @@
   </Files>
 </Directory>
 
-<VirtualHost *:80>
+<VirtualHost <%= vhost_listen %> >
    ServerName www.nl.debian.org
    ServerAdmin webmaster@debian.org
    ServerAlias www.debian.com www.debian.de www.*.debian.org newwww.deb.at www.debian.net debian.net debian.org www.debian.at www.debian.eu debian.eu debian.com
@@ -100,7 +100,7 @@
    RewriteRule ^/(.*)$ http://www.debian.org/$1 [R=301,L]
 </VirtualHost>
 
-<VirtualHost *:80>
+<VirtualHost <%= vhost_listen %> >
    ServerName www.debian.org
    ServerAdmin webmaster@debian.org
    ServerAlias www-*.debian.org
@@ -217,7 +217,7 @@
 </VirtualHost>
 
 
-<VirtualHost *:80>
+<VirtualHost <%= vhost_listen %> >
    ServerName volatile.debian.org
    ServerAlias volatile-master.debian.org
    ServerAdmin webmaster@debian.org