Showing with 5 additions and 4 deletions.
  1. +1 −1 lib/facter/selinux_custom_policy.rb
  2. +0 −1 manifests/init.pp
  3. +3 −1 manifests/module.pp
  4. +1 −1 metadata.json
2 changes: 1 addition & 1 deletion lib/facter/selinux_custom_policy.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
require 'facter'

Facter.add(:selinux_custom_policy) do
confine kernel: 'Linux', osfamily: 'RedHat', operatingsystemmajrelease: '7', selinux: ['true', true]
confine :kernel => 'Linux', :osfamily => 'RedHat', :operatingsystemmajrelease => '7', :selinux => ['true', true]
setcode do
Facter::Util::Resolution.exec("sestatus | grep 'Loaded policy name' | awk '{ print \$4 }'")
end
Expand Down
1 change: 0 additions & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
$module_prefix = $::selinux::params::module_prefix,
$manage_package = $::selinux::params::manage_package,
$package_name = $::selinux::params::package_name,
$mode = $::selinux::params::mode,

### START Hiera Lookups ###
$selinux_booleans = {},
Expand Down
4 changes: 3 additions & 1 deletion manifests/module.pp
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
$makefile = '/usr/share/selinux/devel/Makefile',
$prefix = 'local_',
$sx_mod_dir = '/usr/share/selinux',
$syncversion = true,
) {

require selinux
Expand All @@ -42,6 +43,7 @@
validate_string($prefix)
validate_absolute_path($sx_mod_dir)
validate_absolute_path($makefile)
validate_bool($syncversion)

$selinux_policy = $::selinux_config_policy ? {
/targeted|strict/ => $::selinux_config_policy,
Expand Down Expand Up @@ -70,6 +72,6 @@
# Warning: change the .te version!
ensure => $ensure,
selmoduledir => $sx_mod_dir,
syncversion => true,
syncversion => $syncversion,
}
}
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jfryman/selinux",
"version": "0.3.0",
"version": "0.3.1",
"author": "jfryman",
"summary": "This class manages SELinux on RHEL based systems",
"license": "Apache-2.0",
Expand Down