Gehel has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/342231 )
Change subject: logrotate - use the new logrotate::rule ...................................................................... logrotate - use the new logrotate::rule Change-Id: I053a406fae8ad8b36006863c086c88c20a630ec4 --- D modules/graphite/files/graphite-web-logrotate D modules/graphite/files/logrotate.conf M modules/graphite/manifests/init.pp M modules/graphite/manifests/web.pp 4 files changed, 20 insertions(+), 44 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/31/342231/1 diff --git a/modules/graphite/files/graphite-web-logrotate b/modules/graphite/files/graphite-web-logrotate deleted file mode 100644 index ce748e2..0000000 --- a/modules/graphite/files/graphite-web-logrotate +++ /dev/null @@ -1,21 +0,0 @@ -##################################################################### -### THIS FILE IS MANAGED BY PUPPET -##################################################################### -# -# Logrotate fragment for graphite-web -# -# source: modules/graphite/files/graphite-web-logrotate -# from: graphite::web -# -/var/log/graphite-web/*.log { - daily - compress - delaycompress - size 100M - rotate 3 - missingok - sharedscripts - postrotate - /usr/sbin/service uwsgi-graphite-web restart > /dev/null - endscript -} diff --git a/modules/graphite/files/logrotate.conf b/modules/graphite/files/logrotate.conf deleted file mode 100644 index 6e8955b..0000000 --- a/modules/graphite/files/logrotate.conf +++ /dev/null @@ -1,14 +0,0 @@ -/var/log/uwsgi-graphite-web.log { - daily - dateext - dateyesterday - rotate 14 - missingok - nocreate - compress - delaycompress - sharedscripts - postrotate - service rsyslog rotate >/dev/null 2>&1 || true - endscript -} diff --git a/modules/graphite/manifests/init.pp b/modules/graphite/manifests/init.pp index 8e70093..243bed1 100644 --- a/modules/graphite/manifests/init.pp +++ b/modules/graphite/manifests/init.pp @@ -171,8 +171,17 @@ source => 'puppet:///modules/graphite/rsyslog.conf', } - logrotate::conf { 'graphite': - source => 'puppet:///modules/graphite/logrotate.conf', + logrotate::rule { 'graphite': + file_pattern => '/var/log/uwsgi-graphite-web.log', + daily => true, + date_ext => true, + date_yesterday => true, + rotate => 14, + missing_ok => true, + no_create => true, + compress => true, + delay_compress => true, + post_rotate => 'service rsyslog rotate >/dev/null 2>&1 || true', } base::service_unit { 'carbon-cache@': diff --git a/modules/graphite/manifests/web.pp b/modules/graphite/manifests/web.pp index 9f15e2a..035a917 100644 --- a/modules/graphite/manifests/web.pp +++ b/modules/graphite/manifests/web.pp @@ -145,13 +145,15 @@ require => File['/usr/local/sbin/graphite-auth'], } - file { '/etc/logrotate.d/graphite-web': - ensure => present, - mode => '0444', - owner => 'root', - group => 'root', - source => 'puppet:///modules/graphite/graphite-web-logrotate', - require => File['/var/log/graphite-web'], + logrotate::rule { 'graphite-web': + file_pattern => '/var/log/graphite-web/*.log', + daily => true, + compress => true, + delay_compress => true, + size => '100M', + rotate => 3, + missing_ok => true, + post_rotate => '/usr/sbin/service uwsgi-graphite-web restart > /dev/null', } } -- To view, visit https://gerrit.wikimedia.org/r/342231 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I053a406fae8ad8b36006863c086c88c20a630ec4 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