Gehel has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342229 )
Change subject: eventlogging - use the new logrotate::rule
......................................................................
eventlogging - use the new logrotate::rule
Change-Id: I92c42f71715bcf9cb29c50fe3da1aec4388a7bc6
---
M modules/eventlogging/manifests/server.pp
D modules/eventlogging/templates/logrotate.erb
2 files changed, 9 insertions(+), 17 deletions(-)
Approvals:
jenkins-bot: Verified
Gehel: Looks good to me, approved
diff --git a/modules/eventlogging/manifests/server.pp
b/modules/eventlogging/manifests/server.pp
index 34bd6ec..fff55aa 100644
--- a/modules/eventlogging/manifests/server.pp
+++ b/modules/eventlogging/manifests/server.pp
@@ -104,10 +104,15 @@
mode => '0644',
}
- logrotate::conf { 'eventlogging':
- ensure => present,
- content => template('eventlogging/logrotate.erb'),
- require => File[$log_dir],
+ logrotate::rule { 'eventlogging':
+ ensure => present,
+ file_glob => "${log_dir}/*.log",
+ not_if_empty => true,
+ max_age => 30,
+ rotate => 2,
+ date_ext => true,
+ compress => true,
+ missing_ok => true,
}
# Temporary conditional while we migrate eventlogging service over to
diff --git a/modules/eventlogging/templates/logrotate.erb
b/modules/eventlogging/templates/logrotate.erb
deleted file mode 100644
index 82e1271..0000000
--- a/modules/eventlogging/templates/logrotate.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file is managed by Puppet.
-# puppet:///eventlogging/logrotate.erb
-# Rotate eventlogging daemon runtime logs
-#
-<%= @log_dir %>/*.log {
- notifempty
- maxage 30
- rotate 2
- dateext
- compress
- delaycompress
- missingok
-}
--
To view, visit https://gerrit.wikimedia.org/r/342229
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I92c42f71715bcf9cb29c50fe3da1aec4388a7bc6
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel <[email protected]>
Gerrit-Reviewer: Elukey <[email protected]>
Gerrit-Reviewer: Gehel <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
