From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 28 May 2018 08:53:11 +0000 (+0200)
Subject: varnish on stretch now takes several -a arguments instead of one with multiple addresses
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=b56ddffb764246bad65b6358575c72468d7e3891;p=mirror%2Fdsa-puppet.git

varnish on stretch now takes several -a arguments instead of one with multiple addresses
---

diff --git a/modules/varnish/manifests/config.pp b/modules/varnish/manifests/config.pp
index a46f799a0..3e5c5220e 100644
--- a/modules/varnish/manifests/config.pp
+++ b/modules/varnish/manifests/config.pp
@@ -1,5 +1,5 @@
 define varnish::config (
-	$listen = ':6081',
+	$listen = [':6081'],
 	$source=undef,
 	$content=undef,
 	$ensure = 'present',
@@ -17,11 +17,13 @@ define varnish::config (
 				fail ( "No configuration found for ${name}" )
 			}
 
+			$listenarr = [] + $listen
+			$listenstr = join(prefix($listenarr, "-a "), " ")
 			systemd::override { 'varnish':
 				content  => @("EOF"),
 					[Service]
 					ExecStart=
-					ExecStart=/usr/sbin/varnishd -a ${listen} -T localhost:6082 -f /etc/varnish/${name}.vcl -S /etc/varnish/secret -s ${backend}
+					ExecStart=/usr/sbin/varnishd ${listenstr} -T localhost:6082 -f /etc/varnish/${name}.vcl -S /etc/varnish/secret -s ${backend}
 					| EOF
 			}