From: Paul Wise <pabs@debian.org>
Date: Wed, 25 Jul 2018 03:33:14 +0000 (+0800)
Subject: Set vhost_listen variables required by apache-www.debian.org template
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=02a676416dddafb10f13902b316b6a581c57b1e9;p=mirror%2Fdsa-puppet.git

Set vhost_listen variables required by apache-debian.org template

Fixes: commit e9c182207bf901dd7689986fc02e5c4e24c4553a
---

diff --git a/modules/roles/manifests/www_master.pp b/modules/roles/manifests/www_master.pp
index bc37aa863..40937028b 100644
--- a/modules/roles/manifests/www_master.pp
+++ b/modules/roles/manifests/www_master.pp
@@ -4,6 +4,8 @@ class roles::www_master {
 		key => true,
 	}
 
+	$vhost_listen = '*:80'
+	$vhost_listen_443 = '*:443'
 	$wwwdo_server_name = 'www-staging.debian.org'
 	$wwwdo_document_root = '/srv/www.debian.org/www'
 	apache2::site { '005-www-staging.debian.org':