BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/115637
Change subject: Varnish should restart on initscript/defaults changes
......................................................................
Varnish should restart on initscript/defaults changes
Currently, if the initscript's contents change (CC_COMMAND
for loading new shared libs for VCL), this doesn't trigger a
restart to pick up the new settings, and then later vcl-reload
operations fail.
Change-Id: Ie34b96a4f3bc1546f0170eb21d1005274c7c52bb
---
M modules/varnish/manifests/instance.pp
1 file changed, 5 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/37/115637/1
diff --git a/modules/varnish/manifests/instance.pp
b/modules/varnish/manifests/instance.pp
index ef50ec1..2850bec 100644
--- a/modules/varnish/manifests/instance.pp
+++ b/modules/varnish/manifests/instance.pp
@@ -77,15 +77,17 @@
service { "varnish${instancesuffix}":
ensure => running,
require => [
- File["/etc/default/varnish${instancesuffix}"],
- File["/etc/init.d/varnish${instancesuffix}"],
File["/etc/varnish/${vcl}.inc.vcl"],
File["/etc/varnish/wikimedia_${vcl}.vcl"],
Mount['/var/lib/varnish']
],
hasstatus => false,
pattern => "/var/run/varnishd${instancesuffix}.pid",
- subscribe => Package['varnish'],
+ subscribe => [
+ File["/etc/default/varnish${instancesuffix}"],
+ File["/etc/init.d/varnish${instancesuffix}"],
+ Package['varnish']
+ ],
before => Exec['generate varnish.pyconf'],
}
--
To view, visit https://gerrit.wikimedia.org/r/115637
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie34b96a4f3bc1546f0170eb21d1005274c7c52bb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
