X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fvarnish%2Fmanifests%2Fconfig.pp;h=dc407f9987da86fffaab390de57bc9c71b3f12ea;hb=e04ab5e864ae21d8ea31efb9e7bacf43091f50a3;hp=e45edd82465f646f4b0fd8b8152d3fbb7ed5c59c;hpb=5a095c4af713ace97fd0dc070ba9d430679d5264;p=mirror%2Fdsa-puppet.git diff --git a/modules/varnish/manifests/config.pp b/modules/varnish/manifests/config.pp index e45edd824..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,8 +20,10 @@ 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 -j unix,user=vcache -F ${listenstr} -T localhost:6082 -f /etc/varnish/${name}.vcl -S /etc/varnish/secret -s ${backend}