Merge pull request #11 from jordiprats/master

apparmor
NTTCom-MS · Sep 28, 2018 · a0ac153 · a0ac153
2 parents 4f5a16c + 8a4f621
commit a0ac153
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -8,7 +8,7 @@
     path => '/usr/sbin:/usr/bin:/sbin:/bin',
   }
 
-  package { 'apparmor-utils':
+  package { $apparmor::params::packages:
     ensure => 'installed',
   }
 

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -8,6 +8,7 @@
     }
     'Debian':
     {
+      $packages = [ 'apparmor-utils' ]
       case $::operatingsystem
       {
         'Ubuntu':
@@ -28,6 +29,7 @@
     }
     'Suse':
     {
+      $packages = [ 'apparmor-utils', 'apparmor-parser' ]
       case $::operatingsystem
       {
         'SLES':
@@ -41,7 +43,7 @@
             }
             '12.3':
             {
-              $apparmor_dir = '/etc/apparmor'
+              $apparmor_dir = '/etc/apparmor.d'
               $default_mode='complain'
             }
             default: { fail("Unsupported SLES version ${::operatingsystem} ${::operatingsystemrelease}") }