Merge pull request #17 from Klaas-/Klaas--sles12fixes

update params.pp for sles12
kemra102 · Nov 24, 2016 · d4dea59 · d4dea59
2 parents 2289fe2 + dc1c548
commit d4dea59
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -247,7 +247,7 @@ If **true** then **/etc/audit/rules.d/** will be managed by this module. This me
 
 Defaults:
 
-* EL7: `true`
+* EL7/SLES12: `true`
 * Others: `false`
 
 #### `rules_file`

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -21,11 +21,20 @@
     }
     'Suse': {
       $package_name       = 'audit'
-      $audisp_package     = 'audispd-plugins'
-      $manage_audit_files = false
-      $rules_file         = '/etc/audit/audit.rules'
-      $service_restart    = '/etc/init.d/auditd restart'
-      $service_stop       = '/etc/init.d/auditd stop'
+      if versioncmp($::operatingsystemrelease, '12') >= 0 and $::operatingsystem == 'SLES' {
+        $audisp_package     = 'audit-audispd-plugins'
+        $manage_audit_files = true
+        $rules_file         = '/etc/audit/rules.d/puppet.rules'
+        $service_restart    = '/bin/systemctl restart auditd'
+        $service_stop       = '/bin/systemctl stop auditd'
+      }
+      else {
+        $audisp_package     = 'audispd-plugins'
+        $manage_audit_files = false
+        $rules_file         = '/etc/audit/audit.rules'
+        $service_restart    = '/etc/init.d/auditd restart'
+        $service_stop       = '/etc/init.d/auditd stop'
+      }
     }
     'RedHat': {
       $package_name       = 'audit'

diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
@@ -3,6 +3,7 @@
   context 'default parameters on RedHat 7' do
     let (:facts) {{
       :osfamily               => 'RedHat',
+      :operatingsystem        => 'RedHat',
       :operatingsystemrelease => '7',
       :concat_basedir         => '/var/lib/puppet/concat',
     }}
@@ -39,6 +40,7 @@
   context 'default parameters on RedHat 6' do
     let (:facts) {{
       :osfamily               => 'RedHat',
+      :operatingsystem        => 'RedHat',
       :operatingsystemrelease => '6',
       :concat_basedir         => '/var/lib/puppet/concat',
     }}
@@ -52,6 +54,7 @@
   context 'default parameters on Amazon Linux' do
     let (:facts) {{
       :osfamily               => 'RedHat',
+      :operatingsystem        => 'RedHat',
       :operatingsystemrelease => '7',
       :operatingsystem        => 'Amazon',
       :concat_basedir         => '/var/lib/puppet/concat',
@@ -66,6 +69,7 @@
   context 'default parameters on Debian 8' do
     let (:facts) {{
       :osfamily          => 'Debian',
+      :operatingsystem   => 'Debian',
       :lsbmajdistrelease => '8',
       :concat_basedir    => '/var/lib/puppet/concat',
     }}
@@ -80,6 +84,7 @@
   context 'default parameteres on Ubuntu 14.04' do
     let (:facts) {{
       :osfamily          => 'Debian',
+      :operatingsystem   => 'Debian',
       :operatingsystem   => 'Ubuntu',
       :lsbmajdistrelease => '14.04',
       :concat_basedir    => '/var/lib/puppet/concat',
@@ -94,8 +99,9 @@
   end
   context 'default parameters on Archlinux' do
     let (:facts) {{
-      :osfamily       => 'Archlinux',
-      :concat_basedir => '/var/lib/puppet/concat',
+      :osfamily        => 'Archlinux',
+      :operatingsystem => 'Archlinux',
+      :concat_basedir  => '/var/lib/puppet/concat',
     }}
     it {
       should contain_package('audit')
@@ -107,8 +113,9 @@
   end
   context 'default parameters on Gentoo' do
     let (:facts) {{
-      :osfamily       => 'Gentoo',
-      :concat_basedir => '/var/lib/puppet/concat',
+      :osfamily        => 'Gentoo',
+      :operatingsystem => 'Gentoo',
+      :concat_basedir  => '/var/lib/puppet/concat',
     }}
     it {
       should contain_package('audit')
@@ -121,6 +128,7 @@
   context 'auditd.conf is well-formed' do
     let (:facts) {{
       :osfamily               => 'RedHat',
+      :operatingsystem        => 'RedHat',
       :operatingsystemrelease => '7',
     }}
     it {