Muehlenhoff has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/350149 )
Change subject: Make wikidata logrotate config compatible with jessie ...................................................................... Make wikidata logrotate config compatible with jessie 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. Bug: T163555 Change-Id: Ibcfa51d42108c785f3490f021e545c89ea87e1ed --- M modules/mediawiki/manifests/maintenance/wikidata.pp R modules/mediawiki/templates/maintenance/logrotate.d_wikidata.erb 2 files changed, 8 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/49/350149/1 diff --git a/modules/mediawiki/manifests/maintenance/wikidata.pp b/modules/mediawiki/manifests/maintenance/wikidata.pp index d5212c6..e159184 100644 --- a/modules/mediawiki/manifests/maintenance/wikidata.pp +++ b/modules/mediawiki/manifests/maintenance/wikidata.pp @@ -50,11 +50,13 @@ mode => '0664', } + $log_ownership_user = $::mediawiki::users::web + $log_ownership_group = $::mediawiki::users::web file { '/etc/logrotate.d/wikidata': - ensure => $ensure, - source => 'puppet:///modules/mediawiki/maintenance/logrotate.d_wikidata', - owner => 'root', - group => 'root', - mode => '0444', + ensure => $ensure, + content => template('mediawiki/maintenance/logrotate.d_wikidata.erb'), + owner => 'root', + group => 'root', + mode => '0444', } } diff --git a/modules/mediawiki/files/maintenance/logrotate.d_wikidata b/modules/mediawiki/templates/maintenance/logrotate.d_wikidata.erb similarity index 85% rename from modules/mediawiki/files/maintenance/logrotate.d_wikidata rename to modules/mediawiki/templates/maintenance/logrotate.d_wikidata.erb index 0d3cfdc..b77440a 100644 --- a/modules/mediawiki/files/maintenance/logrotate.d_wikidata +++ b/modules/mediawiki/templates/maintenance/logrotate.d_wikidata.erb @@ -4,6 +4,7 @@ ##################################################################### /var/log/wikidata/*.log { + su <%= @log_ownership_user %> <%= @log_ownership_group %> daily notifempty maxage 180 -- To view, visit https://gerrit.wikimedia.org/r/350149 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibcfa51d42108c785f3490f021e545c89ea87e1ed Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Muehlenhoff <mmuhlenh...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits