projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pass pool-name token to volumes-delete-old
[mirror/dsa-puppet.git]
/
modules
/
varnish
/
manifests
/
config.pp
diff --git
a/modules/varnish/manifests/config.pp
b/modules/varnish/manifests/config.pp
index
a46f799
..
dc407f9
100644
(file)
--- a/
modules/varnish/manifests/config.pp
+++ b/
modules/varnish/manifests/config.pp
@@
-1,5
+1,5
@@
define varnish::config (
define varnish::config (
- $listen =
':6081'
,
+ $listen =
[':6081']
,
$source=undef,
$content=undef,
$ensure = 'present',
$source=undef,
$content=undef,
$ensure = 'present',
@@
-12,16
+12,21
@@
define varnish::config (
case $ensure {
present: {
include varnish::base
case $ensure {
present: {
include varnish::base
+ include stretch::network_online
if ! ($source or $content) {
fail ( "No configuration found for ${name}" )
}
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"),
content => @("EOF"),
+ [Unit]
+ After=network-online.target
[Service]
ExecStart=
[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
}
| EOF
}