Merge pull request #124 from Heidistein/master

Allow cron to always mail its output.

README.md

@@ -173,6 +173,10 @@ class { '::logrotate':
 ```
 ## Examples
 
+#### Cron output
+
+Default the cron output is discarded if there is no error output. To enable this output, when you (for example) enable the verbose startup argument, enable the $cron_always_output boolean on the logrotate class.
+
 ```puppet
 logrotate::conf { '/etc/logrotate.conf':
   rotate       => 10,

manifests/cron.pp

@@ -23,6 +23,8 @@
     $_logrotate_args = $logrotate::logrotate_args
   }
 
+  $cron_always_output = $logrotate::cron_always_output
+
   $logrotate_args = join($_logrotate_args, ' ')
 
   # FreeBSD does not have /etc/cron.daily, so we need to have Puppet maintain

manifests/init.pp

@@ -22,7 +22,8 @@
   Stdlib::Filemode $rules_configdir_mode = $logrotate::params::rules_configdir_mode,
   String $root_user                      = $logrotate::params::root_user,
   String $root_group                     = $logrotate::params::root_group,
-  Array[String[1]] $logrotate_args       = []
+  Array[String[1]] $logrotate_args       = [],
+  Boolean $cron_always_output            = false,
 ) inherits logrotate::params {
 
   contain ::logrotate::install

spec/defines/cron_spec.rb

@@ -78,6 +78,18 @@
             with_content(%r{(\/usr\/local\/sbin\/logrotate -s \/var\/lib\/logrotate\/logrotate.status -m \/usr\/sbin\/mailer \/usr\/local\/etc\/logrotate.conf 2>&1)})
         }
       end
+
+      context 'With additional arguments' do
+        let(:pre_condition) { 'class {"::logrotate": cron_always_output => true}' }
+        let(:title) { 'test' }
+        let(:params) { { ensure: 'present' } }
+
+        it {
+          is_expected.to contain_file('/usr/local/bin/logrotate.test.sh').
+            with_ensure('present').
+            with_content(%r{(else\n    echo "\${OUTPUT}"\nfi)})
+        }
+      end
     end
   end
 end

templates/etc/cron/logrotate.erb

@@ -7,5 +7,9 @@ EXITVALUE=$?
 if [ $EXITVALUE != 0 ]; then
     /usr/bin/logger -t logrotate "ALERT exited abnormally with [$EXITVALUE]"
     echo "${OUTPUT}"
+<% if @cron_always_output -%>
+else
+    echo "${OUTPUT}"
+<% end -%>
 fi
 exit $EXITVALUE