Fixes rodjek#34 - Ubuntu Xenial and up support (rodjek#43)

* Fixes rodjek#34 - Ubuntu Xenial and up support
UCSD-ANF · Sep 18, 2016 · 5bf6fc4 · 5bf6fc4
1 parent 6937d91
commit 5bf6fc4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/manifests/defaults.pp b/manifests/defaults.pp
@@ -6,15 +6,12 @@
     'Debian': {
 
       if !defined( Logrotate::Conf['/etc/logrotate.conf'] ) {
-        case $::lsbdistcodename {
-          'trusty': {
-            logrotate::conf {'/etc/logrotate.conf':
-              su_group => 'syslog',
-            }
-          }
-          default: {
-            logrotate::conf {'/etc/logrotate.conf': }
+        if versioncmp($::lsbdistrelease, '14.04') >= 0 {
+          logrotate::conf {'/etc/logrotate.conf':
+            su_group => 'syslog',
           }
+        } else {
+          logrotate::conf {'/etc/logrotate.conf': }
         }
       }
 

diff --git a/spec/defines/conf_spec.rb b/spec/defines/conf_spec.rb
@@ -6,7 +6,7 @@
       {
         osfamily: 'Debian',
         operatingsystem: 'Debian',
-        lsbdistcodename: 'Imaginary'
+        lsbdistrelease: 'Imaginary'
       }
     end
     context 'with an alphanumeric title' do

diff --git a/spec/defines/rule_spec.rb b/spec/defines/rule_spec.rb
@@ -6,7 +6,7 @@
       {
         osfamily: 'Debian',
         operatingsystem: 'Debian',
-        lsbdistcodename: 'Imaginary'
+        lsbdistrelease: 'Imaginary'
       }
     end
     context 'with an alphanumeric title' do