Merge pull request #92 from szponek/fix-default-logrotate-conf-on-ubuntu

Fix missing su line in default logrotate.conf on Ubuntu
voxpupuli · Nov 26, 2017 · 63ced8e · 63ced8e
2 parents 65da0b9 + 208fe2d
commit 63ced8e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -31,11 +31,16 @@
       }
     }
     'Debian': {
-      $default_su_group = versioncmp($::operatingsystemmajrelease, '14.00') ? {
+      $default_su_user = versioncmp($facts['operatingsystemmajrelease'], '14.00') ? {
+        1        => 'root',
+        default  => undef,
+      }
+      $default_su_group = versioncmp($facts['operatingsystemmajrelease'], '14.00') ? {
         1         => 'syslog',
         default   => undef
       }
       $conf_params = {
+        su_user  => $default_su_user,
         su_group => $default_su_group,
       }
       $configdir     = '/etc'

diff --git a/spec/classes/defaults_spec.rb b/spec/classes/defaults_spec.rb
@@ -16,11 +16,17 @@
 
       if facts[:operatingsystem] == 'Ubuntu' && facts[:operatingsystemmajrelease].to_i >= 14
         it {
-          is_expected.to contain_logrotate__conf('/etc/logrotate.conf').with_su_group('syslog')
+          is_expected.to contain_logrotate__conf('/etc/logrotate.conf').with(
+            'su_user' => 'root',
+            'su_group' => 'syslog'
+          )
         }
       else
         it {
-          is_expected.to contain_logrotate__conf('/etc/logrotate.conf').with_su_group(nil)
+          is_expected.to contain_logrotate__conf('/etc/logrotate.conf').with(
+            'su_user' => nil,
+            'su_group' => nil
+          )
         }
       end
       it {