Gehel has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/373510 )
Change subject: apertium - switch to logrotate::rule ...................................................................... apertium - switch to logrotate::rule Change-Id: Ic895ba311d29d6a404ff1662bb7ef2ff2c1426ff --- M modules/apertium/manifests/init.pp D modules/apertium/templates/logrotate.erb 2 files changed, 9 insertions(+), 16 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/10/373510/1 diff --git a/modules/apertium/manifests/init.pp b/modules/apertium/manifests/init.pp index ad2a8de..b00a991 100644 --- a/modules/apertium/manifests/init.pp +++ b/modules/apertium/manifests/init.pp @@ -124,8 +124,14 @@ before => Service['apertium-apy'], } - logrotate::conf { 'apertium-apy': - ensure => present, - content => template('apertium/logrotate.erb'), + logrotate::rule { 'apertium-apy': + ensure => present, + file_glob => "${log_dir}/apertium-apy.log ${log_dir}/apertium-apy.err", + frequency => 'daily', + copytruncate => true, + missingok => true, + compress => true, + notifempty => true, + rotate => 15, } } diff --git a/modules/apertium/templates/logrotate.erb b/modules/apertium/templates/logrotate.erb deleted file mode 100644 index 3dbeef6..0000000 --- a/modules/apertium/templates/logrotate.erb +++ /dev/null @@ -1,13 +0,0 @@ -##################################################################### -### THIS FILE IS MANAGED BY PUPPET -##################################################################### - -<%= @log_dir %>/apertium-apy.log <%= @log_dir %>/apertium-apy.err { - daily - copytruncate - missingok - compress - delaycompress - notifempty - rotate 15 -} -- To view, visit https://gerrit.wikimedia.org/r/373510 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic895ba311d29d6a404ff1662bb7ef2ff2c1426ff Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Gehel <guillaume.leder...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits