Gehel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373516 )

Change subject: camus - switch to logrotate::rule
......................................................................


camus - switch to logrotate::rule

Change-Id: Ia106725f808588f6791f741714d620a6a5dce51a
---
D modules/camus/files/camus.logrotate
M modules/camus/manifests/init.pp
M modules/logrotate/manifests/rule.pp
M modules/logrotate/templates/logrotate.erb
4 files changed, 13 insertions(+), 13 deletions(-)

Approvals:
  jenkins-bot: Verified
  Gehel: Looks good to me, approved



diff --git a/modules/camus/files/camus.logrotate 
b/modules/camus/files/camus.logrotate
deleted file mode 100644
index 09aee2f..0000000
--- a/modules/camus/files/camus.logrotate
+++ /dev/null
@@ -1,10 +0,0 @@
-# Note:  This file is managed by Puppet.
-#
-/var/log/camus/*.log {
-  weekly
-  rotate 4
-  missingok
-  notifempty
-  nocreate
-  su root hdfs
-}
diff --git a/modules/camus/manifests/init.pp b/modules/camus/manifests/init.pp
index 2f038ac..1fb14f8 100644
--- a/modules/camus/manifests/init.pp
+++ b/modules/camus/manifests/init.pp
@@ -22,8 +22,14 @@
     }
 
     # logrotate camus log files
-    logrotate::conf { 'camus':
-        ensure => present,
-        source => 'puppet:///modules/camus/camus.logrotate',
+    logrotate::rule { 'camus':
+        ensure       => present,
+        file_glob    => '/var/log/camus/*.log',
+        frequency    => 'weekly',
+        rotate       => 4,
+        missing_ok   => true,
+        not_if_empty => true,
+        no_create    => true,
+        su           => 'root hdfs',
     }
 }
diff --git a/modules/logrotate/manifests/rule.pp 
b/modules/logrotate/manifests/rule.pp
index fe81c1a..ec71f43 100644
--- a/modules/logrotate/manifests/rule.pp
+++ b/modules/logrotate/manifests/rule.pp
@@ -29,6 +29,7 @@
     $size           = undef,
     $no_create      = false,
     $post_rotate    = undef,
+    $su             = undef,
 ) {
 
     $valid_frequencies = [ 'daily', 'weekly', 'monthly', 'yearly' ]
diff --git a/modules/logrotate/templates/logrotate.erb 
b/modules/logrotate/templates/logrotate.erb
index c85c5b3..0f8c8fa 100644
--- a/modules/logrotate/templates/logrotate.erb
+++ b/modules/logrotate/templates/logrotate.erb
@@ -36,6 +36,9 @@
 <% if @no_create -%>
     nocreate
 <% end -%>
+<% if @su -%>
+    su <%= @su %>
+<% end -%>
 <% if @post_rotate -%>
     sharedscripts
     postrotate

-- 
To view, visit https://gerrit.wikimedia.org/r/373516
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia106725f808588f6791f741714d620a6a5dce51a
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel <[email protected]>
Gerrit-Reviewer: Gehel <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to