Elukey has submitted this change and it was merged. Change subject: Set l10nupdate group in its related logrotate config file ......................................................................
Set l10nupdate group in its related logrotate config file This is a follow up of https://gerrit.wikimedia.org/r/#/c/313563, originally intended to reduce cronspam from mira. Now we get the following email from tin: /etc/cron.daily/logrotate: error: error setting owner of /var/log/l10nupdatelog/l10nupdate.log-20161003.gz to uid 10002 and gid 10002: Operation not permitted run-parts: /etc/cron.daily/logrotate exited with return code 1 On tin each file under /var/log/l10nupdate is owned by l10nupdate:l10nupdate, not l10nupdate:wikidev. Bug: T132324 Change-Id: I947097bfbf0f9475a79bcef9346203a2c8245584 --- R modules/scap/files/l10nupdate.logrotate M modules/scap/manifests/l10nupdate.pp 2 files changed, 4 insertions(+), 5 deletions(-) Approvals: Elukey: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/scap/templates/l10nupdate.logrotate.erb b/modules/scap/files/l10nupdate.logrotate similarity index 88% rename from modules/scap/templates/l10nupdate.logrotate.erb rename to modules/scap/files/l10nupdate.logrotate index 8d1e3e7..6c9824f 100644 --- a/modules/scap/templates/l10nupdate.logrotate.erb +++ b/modules/scap/files/l10nupdate.logrotate @@ -4,7 +4,7 @@ ##################################################################### /var/log/l10nupdatelog/*.log { - su l10nupdate <%= @deployment_group %> + su l10nupdate l10nupdate daily notifempty maxage 180 @@ -13,5 +13,4 @@ compress delaycompress missingok -} - +} \ No newline at end of file diff --git a/modules/scap/manifests/l10nupdate.pp b/modules/scap/manifests/l10nupdate.pp index c3a6e23..8853fa2 100644 --- a/modules/scap/manifests/l10nupdate.pp +++ b/modules/scap/manifests/l10nupdate.pp @@ -117,8 +117,8 @@ } logrotate::conf { 'l10nupdate': - ensure => present, - content => template('scap/l10nupdate.logrotate.erb'), + ensure => present, + source => 'puppet:///modules/scap/l10nupdate.logrotate' } # Git clones for the l10update git job -- To view, visit https://gerrit.wikimedia.org/r/314026 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I947097bfbf0f9475a79bcef9346203a2c8245584 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Elukey <[email protected]> Gerrit-Reviewer: Andrew Bogott <[email protected]> Gerrit-Reviewer: Elukey <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
