[EOPS-6067] manually add in fixes from rodjek#32

wolfspyre · Jul 9, 2014 · af0b6f9 · af0b6f9
1 parent 7914e9a
commit af0b6f9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/manifests/base.pp b/manifests/base.pp
@@ -30,7 +30,7 @@
     '/etc/logrotate.conf':
       ensure  => file,
       mode    => '0444',
-      source  => 'puppet:///modules/logrotate/etc/logrotate.conf';
+      content => template('logrotate/etc/logrotate.conf.erb');
     '/etc/logrotate.d':
       ensure       => directory,
       backup       => $backup,

diff --git a/spec/classes/base_spec.rb b/spec/classes/base_spec.rb
@@ -50,7 +50,7 @@
       'owner'   => 'root',
       'group'   => 'root',
       'mode'    => '0444',
-      'source'  => 'puppet:///modules/logrotate/etc/logrotate.conf',
+      'content' => /# THIS FILE IS AUTOMATICALLY DISTRIBUTED BY PUPPET.  ANY CHANGES WILL BE/,
       'require' => 'Package[logrotate]',
     })
 

diff --git a/files/etc/logrotate.conf → templates/etc/logrotate.conf.erb b/files/etc/logrotate.conf → templates/etc/logrotate.conf.erb
@@ -5,6 +5,12 @@
 # rotate log files weekly
 weekly
 
+<% if @lsbmajdistrelease and (scope.function_versioncmp([@lsbmajdistrelease, '14']) >= 0) -%>
+# use the syslog group by default, since this is the owning group
+# # of /var/log/syslog.
+su root syslog
+<%- end -%>
+
 # keep 4 weeks worth of backlogs
 rotate 4