Akosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/95625
Change subject: netmapper perms/owner fixups
......................................................................
netmapper perms/owner fixups
Plus sneak in some swift changes missed earlier
Change-Id: I42a6bdfc9c72fda64b55655b993d8c04be6c7e06
---
M manifests/role/swift.pp
M modules/varnish/manifests/netmapper_update.pp
2 files changed, 10 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/25/95625/1
diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp
index 2bd95d7..39934cd 100644
--- a/manifests/role/swift.pp
+++ b/manifests/role/swift.pp
@@ -69,17 +69,19 @@
class ganglia_reporter inherits role::swift::eqiad-prod {
# one host per cluster should report global stats
file {
"/usr/local/bin/swift-ganglia-report-global-stats":
- path =>
"/usr/local/bin/swift-ganglia-report-global-stats",
- mode => 0555,
+ ensure => present,
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
source =>
"puppet:///files/swift/swift-ganglia-report-global-stats",
ensure => present;
}
# config file to hold the password
$password =
$passwords::swift::eqiad-prod::rewrite_password
file { "/etc/swift-ganglia-report-global-stats.conf":
- mode => 0440,
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
+ mode => '0440',
content =>
template("swift/swift-ganglia-report-global-stats.conf.erb");
}
cron { "swift-ganglia-report-global-stats":
diff --git a/modules/varnish/manifests/netmapper_update.pp
b/modules/varnish/manifests/netmapper_update.pp
index bba5889..f76a90c 100644
--- a/modules/varnish/manifests/netmapper_update.pp
+++ b/modules/varnish/manifests/netmapper_update.pp
@@ -19,8 +19,10 @@
}
file { '/usr/share/varnish/netmapper_update.sh':
- source => "puppet:///modules/${module_name}/netmapper_update.sh",
+ owner => 'root',
+ group => 'root',
mode => '0555';
+ source => "puppet:///modules/${module_name}/netmapper_update.sh",
}
}
--
To view, visit https://gerrit.wikimedia.org/r/95625
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I42a6bdfc9c72fda64b55655b993d8c04be6c7e06
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Akosiaris <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
