Muehlenhoff has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/350138 )
Change subject: Make translationnotifications logrotate config compatible with jessie ...................................................................... Make translationnotifications 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: I5f18fe51854303a531b7a960dc7d989a0b08740e --- M modules/mediawiki/manifests/maintenance/translationnotifications.pp R modules/mediawiki/templates/maintenance/logrotate.d_translationnotifications.erb 2 files changed, 7 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/38/350138/1 diff --git a/modules/mediawiki/manifests/maintenance/translationnotifications.pp b/modules/mediawiki/manifests/maintenance/translationnotifications.pp index 1bd0c75..18464cb 100644 --- a/modules/mediawiki/manifests/maintenance/translationnotifications.pp +++ b/modules/mediawiki/manifests/maintenance/translationnotifications.pp @@ -28,12 +28,13 @@ mode => '0664', } + $log_ownership_user = $::mediawiki::users::web file { '/etc/logrotate.d/l10nupdate': - ensure => $ensure, - source => 'puppet:///modules/mediawiki/maintenance/logrotate.d_translationnotifications', - owner => 'root', - group => 'root', - mode => '0444', + ensure => $ensure, + content => template('mediawiki/maintenance/logrotate.d_translationnotifications.erb'), + owner => 'root', + group => 'root', + mode => '0444', } } diff --git a/modules/mediawiki/files/maintenance/logrotate.d_translationnotifications b/modules/mediawiki/templates/maintenance/logrotate.d_translationnotifications.erb similarity index 90% rename from modules/mediawiki/files/maintenance/logrotate.d_translationnotifications rename to modules/mediawiki/templates/maintenance/logrotate.d_translationnotifications.erb index f500986..10db89f 100644 --- a/modules/mediawiki/files/maintenance/logrotate.d_translationnotifications +++ b/modules/mediawiki/templates/maintenance/logrotate.d_translationnotifications.erb @@ -4,6 +4,7 @@ ################################################################################# /var/log/translationnotifications/*.log { + su <%= @log_ownership_user %> wikidev daily notifempty maxage 180 -- To view, visit https://gerrit.wikimedia.org/r/350138 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5f18fe51854303a531b7a960dc7d989a0b08740e 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