X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fvarnish%2Fmanifests%2Fconfig.pp;h=dc407f9987da86fffaab390de57bc9c71b3f12ea;hb=fc58aacc31f985a2ee4f1dfe9455bda74aca5942;hp=a46f799a08adf4cf763aea83eeca1128b8dda5b1;hpb=0c6f34ec54ca6b4ae390547b7b423e23545511ca;p=mirror%2Fdsa-puppet.git

diff --git a/modules/varnish/manifests/config.pp b/modules/varnish/manifests/config.pp
index a46f799a0..dc407f998 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',
@@ -12,16 +12,21 @@ define varnish::config (
 	case $ensure {
 		present: {
 			include varnish::base
+			include stretch::network_online
 
 			if ! ($source or $content) {
 				fail ( "No configuration found for ${name}" )
 			}
 
-			systemd::override { 'varnish':
+			$listenarr = [] + $listen
+			$listenstr = join(prefix($listenarr, "-a "), " ")
+			dsa_systemd::override { 'varnish':
 				content  => @("EOF"),
+					[Unit]
+					After=network-online.target
 					[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 -j unix,user=vcache -F ${listenstr} -T localhost:6082 -f /etc/varnish/${name}.vcl -S /etc/varnish/secret -s ${backend}
 					| EOF
 			}