Gehel has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/349923 )
Change subject: Make cirrus logrotate config jessie-compatible
......................................................................
Make cirrus logrotate config jessie-compatible
Now that wasat (jessie) is the active mediawiki maintenance server (while
terbium
was on trusty until now), on jessie we're seeing logrotate refuse to rotate
log files due to this change in logrotate mentioned in NEWS:
| Logrotate now skips directories which are world writable or writable
| by group which is not "root" unless the (new) "su" directive is used.
I'm not 100% sure why this doesn't occur in trusty since the base version
is identical, but we needed the same fix for HHVM as well when it was
migrated to jessie in T137689.
Bug: T163555
Change-Id: I7f6a88be72f11e87ba2c9e43da20f2ba0f881c3a
---
M modules/mediawiki/manifests/maintenance/cirrussearch.pp
R modules/mediawiki/templates/maintenance/logrotate.d_cirrus-sanitize.erb
R modules/mediawiki/templates/maintenance/logrotate.d_cirrus-suggest.erb
3 files changed, 9 insertions(+), 4 deletions(-)
Approvals:
jenkins-bot: Verified
Gehel: Looks good to me, approved
diff --git a/modules/mediawiki/manifests/maintenance/cirrussearch.pp
b/modules/mediawiki/manifests/maintenance/cirrussearch.pp
index f673e57..d975cf2 100644
--- a/modules/mediawiki/manifests/maintenance/cirrussearch.pp
+++ b/modules/mediawiki/manifests/maintenance/cirrussearch.pp
@@ -37,9 +37,12 @@
mode => '0775',
}
+ $log_ownership_user = $::mediawiki::users::web
+ $log_ownership_group = $::mediawiki::users::web
+
logrotate::conf { 'cirrus-suggest':
- ensure => $ensure,
- source =>
'puppet:///modules/mediawiki/maintenance/logrotate.d_cirrus-suggest',
+ ensure => $ensure,
+ content =>
template('mediawiki/maintenance/logrotate.d_cirrus-suggest.erb'),
}
file { '/var/log/mediawiki/cirrus-sanitize':
@@ -50,7 +53,7 @@
}
logrotate::conf { 'cirrus-sanitize':
- ensure => $ensure,
- source =>
'puppet:///modules/mediawiki/maintenance/logrotate.d_cirrus-sanitize',
+ ensure => $ensure,
+ content =>
template('mediawiki/maintenance/logrotate.d_cirrus-sanitize.erb'),
}
}
diff --git a/modules/mediawiki/files/maintenance/logrotate.d_cirrus-sanitize
b/modules/mediawiki/templates/maintenance/logrotate.d_cirrus-sanitize.erb
similarity index 83%
rename from modules/mediawiki/files/maintenance/logrotate.d_cirrus-sanitize
rename to
modules/mediawiki/templates/maintenance/logrotate.d_cirrus-sanitize.erb
index 4b740ca..4a007aa 100644
--- a/modules/mediawiki/files/maintenance/logrotate.d_cirrus-sanitize
+++ b/modules/mediawiki/templates/maintenance/logrotate.d_cirrus-sanitize.erb
@@ -3,6 +3,7 @@
#####################################################################
/var/log/mediawiki/cirrus-sanitize/*.log {
+ su <%= @log_ownership_user %> <%= @log_ownership_group %>
daily
notifempty
maxage 30
diff --git a/modules/mediawiki/files/maintenance/logrotate.d_cirrus-suggest
b/modules/mediawiki/templates/maintenance/logrotate.d_cirrus-suggest.erb
similarity index 83%
rename from modules/mediawiki/files/maintenance/logrotate.d_cirrus-suggest
rename to modules/mediawiki/templates/maintenance/logrotate.d_cirrus-suggest.erb
index eaedde9..def37fd 100644
--- a/modules/mediawiki/files/maintenance/logrotate.d_cirrus-suggest
+++ b/modules/mediawiki/templates/maintenance/logrotate.d_cirrus-suggest.erb
@@ -3,6 +3,7 @@
#####################################################################
/var/log/mediawiki/cirrus-suggest/*.log {
+ su <%= @log_ownership_user %> <%= @log_ownership_group %>
daily
notifempty
maxage 30
--
To view, visit https://gerrit.wikimedia.org/r/349923
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7f6a88be72f11e87ba2c9e43da20f2ba0f881c3a
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Ema <[email protected]>
Gerrit-Reviewer: Gehel <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
