Gehel has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342232 )
Change subject: logrotate - use the new logrotate::rule
......................................................................
logrotate - use the new logrotate::rule
Change-Id: I7bb6a48470869ee4dce2989551fcb14275cbc7cb
---
D modules/icinga/files/logrotate.conf
M modules/icinga/manifests/init.pp
2 files changed, 7 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/32/342232/1
diff --git a/modules/icinga/files/logrotate.conf
b/modules/icinga/files/logrotate.conf
deleted file mode 100644
index ebb3d21..0000000
--- a/modules/icinga/files/logrotate.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-#####################################################################
-### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/icinga/logrotate.conf
-#####################################################################
-
-/var/log/icinga/icinga.log {
- daily
- copytruncate
- missingok
- notifempty
- rotate 7
-}
diff --git a/modules/icinga/manifests/init.pp b/modules/icinga/manifests/init.pp
index 9d141ee..8833d31 100644
--- a/modules/icinga/manifests/init.pp
+++ b/modules/icinga/manifests/init.pp
@@ -95,9 +95,13 @@
}
# FIXME: This should be in the package?
- logrotate::conf { 'icinga':
- ensure => present,
- source => 'puppet:///modules/icinga/logrotate.conf',
+ logrotate::rule { 'icinga':
+ file_pattern => '/var/log/icinga/icinga.log',
+ daily => true,
+ copy_truncate => true,
+ missing_ok => true,
+ not_if_empty => true,
+ rotate => 7,
}
# Setup all plugins!
--
To view, visit https://gerrit.wikimedia.org/r/342232
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7bb6a48470869ee4dce2989551fcb14275cbc7cb
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
