diff --git a/manifests/main/config.pp b/manifests/main/config.pp index 139c8f8..41f22dd 100644 --- a/manifests/main/config.pp +++ b/manifests/main/config.pp @@ -13,7 +13,7 @@ class confdroid_selinux::main::config ( command => 'setenforce 1', path => ['/usr/sbin','/usr/bin'], provider => shell, - unless => 'getenforce | grep -i "enforcing"' + unless => 'getenforce | grep -i "enforcing"', } } } diff --git a/manifests/main/install.pp b/manifests/main/install.pp index f24b9d5..db33a84 100644 --- a/manifests/main/install.pp +++ b/manifests/main/install.pp @@ -7,15 +7,9 @@ class confdroid_selinux::main::install ( ) inherits confdroid_selinux::params { - require cd_resources + require confdroid_resources - package { $reqpackages_main: - ensure => $pkg_ensure, - } - - if $sx_install_setools == true { - package { $reqpackages_tools: - ensure => $pkg_ensure, - } + package { $sx_reqpackages: + ensure => $sx_pkg_ensure, } }