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

diff --git a/modules/varnish/manifests/config.pp b/modules/varnish/manifests/config.pp
index 3e5c5220e..dc407f998 100644
--- a/modules/varnish/manifests/config.pp
+++ b/modules/varnish/manifests/config.pp
@@ -12,6 +12,7 @@ define varnish::config (
 	case $ensure {
 		present: {
 			include varnish::base
+			include stretch::network_online
 
 			if ! ($source or $content) {
 				fail ( "No configuration found for ${name}" )
@@ -19,11 +20,13 @@ define varnish::config (
 
 			$listenarr = [] + $listen
 			$listenstr = join(prefix($listenarr, "-a "), " ")
-			systemd::override { 'varnish':
+			dsa_systemd::override { 'varnish':
 				content  => @("EOF"),
+					[Unit]
+					After=network-online.target
 					[Service]
 					ExecStart=
-					ExecStart=/usr/sbin/varnishd ${listenstr} -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
 			}