Allowing the ability to set maxsize allowed

manifests/base.pp

@@ -18,7 +18,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,
       mode    => '0755';

manifests/init.pp

@@ -0,0 +1 @@
+class logrotate {}

manifests/rule.pp

@@ -46,6 +46,11 @@
 #                   (optional).
 # maxage          - The Integer maximum number of days that a rotated log file
 #                   can stay on the system (optional).
+# maxsize         - The String maximum size a log file can be before being
+#                   rotated, even before the additionally specified time
+#                   interval (optional).
+#                   The default units are bytes, append k, M or G for kilobytes,
+#                   megabytes and gigabytes respectively.
 # minsize         - The String minimum size a log file must be to be rotated,
 #                   but not before the scheduled rotation time (optional).
 #                   The default units are bytes, append k, M or G for kilobytes,
@@ -138,6 +143,7 @@
                         $mailfirst       = 'undef',
                         $maillast        = 'undef',
                         $maxage          = 'undef',
+                        $maxsize         = 'undef',
                         $minsize         = 'undef',
                         $missingok       = 'undef',
                         $olddir          = 'undef',
@@ -304,6 +310,14 @@
     }
   }
 
+  case $maxsize {
+    'undef': {}
+    /^\d+[kMG]?$/: {}
+    default: {
+      fail("Logrotate::Rule[${name}]: maxsize must match /\\d+[kMG]?/")
+    }
+  }
+
   case $minsize {
     'undef': {}
     /^\d+[kMG]?$/: {}

spec/classes/base_spec.rb

@@ -9,7 +9,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]',
     })
 

spec/defines/rule_spec.rb

@@ -540,6 +540,64 @@
       end
     end
 
+    ###########################################################################
+    # MAXSIZE
+    context 'and maxsize => 100' do
+      let(:params) {
+        {:path => '/var/log/foo.log', :maxsize => 100}
+      }
+
+      it do
+        should contain_file('/etc/logrotate.d/test') \
+          .with_content(/^  maxsize 100$/)
+      end
+    end
+
+    context 'and maxsize => 100k' do
+      let(:params) {
+        {:path => '/var/log/foo.log', :maxsize => '100k'}
+      }
+
+      it do
+        should contain_file('/etc/logrotate.d/test') \
+          .with_content(/^  maxsize 100k$/)
+      end
+    end
+
+    context 'and maxsize => 100M' do
+      let(:params) {
+        {:path => '/var/log/foo.log', :maxsize => '100M'}
+      }
+
+      it do
+        should contain_file('/etc/logrotate.d/test') \
+          .with_content(/^  maxsize 100M$/)
+      end
+    end
+
+    context 'and maxsize => 100G' do
+      let(:params) {
+        {:path => '/var/log/foo.log', :maxsize => '100G'}
+      }
+
+      it do
+        should contain_file('/etc/logrotate.d/test') \
+          .with_content(/^  maxsize 100G$/)
+      end
+    end
+
+    context 'and maxsize => foo' do
+      let(:params) {
+        {:path => '/var/log/foo.log', :maxsize => 'foo'}
+      }
+
+      it do
+        expect {
+          should contain_file('/etc/logrotate.d/test')
+        }.to raise_error(Puppet::Error, /maxsize must match/)
+      end
+    end
+
     ###########################################################################
     # MINSIZE
     context 'and minsize => 100' do

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
 

templates/etc/logrotate.d/rule.erb

@@ -38,7 +38,7 @@
 
   [
     'compresscmd', 'compressext', 'compressoptions', 'dateformat', 'extension',
-    'maxage', 'minsize', 'rotate', 'size', 'shredcycles', 'start',
+    'maxage', 'maxsize', 'minsize', 'rotate', 'size', 'shredcycles', 'start',
     'uncompresscmd'
   ].each do |key|
     value = scope.to_hash[key]