Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/253457
Change subject: varnish: move file to module
......................................................................
varnish: move file to module
The file varnish-test-geoip is the only file used in the module
that is outside of it. Also fix minor lint issues.
Change-Id: I5916b086d37560ce02384b0f77c8d62f754104d6
---
R modules/varnish/files/varnish-test-geoip
M modules/varnish/manifests/common/vcl.pp
M modules/varnish/manifests/instance.pp
M modules/varnish/manifests/logging/reqstats.pp
4 files changed, 17 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/57/253457/1
diff --git a/files/varnish/varnish-test-geoip
b/modules/varnish/files/varnish-test-geoip
similarity index 100%
rename from files/varnish/varnish-test-geoip
rename to modules/varnish/files/varnish-test-geoip
diff --git a/modules/varnish/manifests/common/vcl.pp
b/modules/varnish/manifests/common/vcl.pp
index c9e5460..cff2aff 100644
--- a/modules/varnish/manifests/common/vcl.pp
+++ b/modules/varnish/manifests/common/vcl.pp
@@ -27,6 +27,6 @@
owner => 'root',
group => 'root',
mode => '0555',
- source => 'puppet:///files/varnish/varnish-test-geoip',
+ source => 'puppet:///modules/varnish/varnish-test-geoip',
}
}
diff --git a/modules/varnish/manifests/instance.pp
b/modules/varnish/manifests/instance.pp
index 7556066..93056f1 100644
--- a/modules/varnish/manifests/instance.pp
+++ b/modules/varnish/manifests/instance.pp
@@ -53,7 +53,7 @@
}
# lint:ignore:quoted_booleans
- if inline_template("<%= @directors.map{|k,v| v['dynamic']
}.include?('yes') %>") == "true" {
+ if inline_template("<%= @directors.map{|k,v| v['dynamic']
}.include?('yes') %>") == 'true' {
$use_dynamic_directors = true
} else {
$use_dynamic_directors = false
@@ -106,20 +106,20 @@
sysvinit => true,
refresh => false,
service_params => {
- tag => 'varnish_instance',
- enable => true,
- require => [
- Package['varnish'],
- File["/etc/default/varnish${instancesuffix}"],
- File["/etc/varnish/${vcl}.inc.vcl"],
- File["/etc/varnish/wikimedia_${vcl}.vcl"],
- Mount['/var/lib/varnish'],
- ],
- # The two below were for upstart only. They seem
- # nonsensical vs fixing the initscript, but I suspect they're
- # harmless on systemd and can be removed later.
- hasstatus => false,
- pattern => "/var/run/varnishd${instancesuffix}.pid",
+ tag => 'varnish_instance',
+ enable => true,
+ require => [
+ Package['varnish'],
+
File["/etc/default/varnish${instancesuffix}"],
+ File["/etc/varnish/${vcl}.inc.vcl"],
+
File["/etc/varnish/wikimedia_${vcl}.vcl"],
+ Mount['/var/lib/varnish'],
+ ],
+ # The two below were for upstart only. They seem
+ # nonsensical vs fixing the initscript, but I
suspect they're
+ # harmless on systemd and can be removed later.
+ hasstatus => false,
+ pattern =>
"/var/run/varnishd${instancesuffix}.pid",
}
}
diff --git a/modules/varnish/manifests/logging/reqstats.pp
b/modules/varnish/manifests/logging/reqstats.pp
index 1d97a32..412fee6 100644
--- a/modules/varnish/manifests/logging/reqstats.pp
+++ b/modules/varnish/manifests/logging/reqstats.pp
@@ -53,7 +53,7 @@
require => File['/usr/local/bin/varnishreqstats'],
service_params => {
require => Service[$varnish_service_name],
- enable => true,
+ enable => true,
},
}
}
--
To view, visit https://gerrit.wikimedia.org/r/253457
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5916b086d37560ce02384b0f77c8d62f754104d6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
