Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to "facts" hash for SELinux facts #259

Merged
merged 1 commit into from
Jul 2, 2018
Merged

Switch to "facts" hash for SELinux facts #259

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions manifests/config.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
fail("Use of private class ${name} by ${caller_module_name}")
}

if ($mode == 'enforcing' and !$::selinux) {
if ($mode == 'enforcing' and !$facts['selinux']) {
notice('SELinux is disabled. Forcing configuration to permissive to avoid problems. To disable this warning, explicitly set selinux::mode to permissive or disabled.')
$_real_mode = 'permissive'
} else {
Expand All @@ -56,7 +56,7 @@
case $_real_mode {
'permissive', 'disabled': {
$sestatus = 'permissive'
if $_real_mode == 'disabled' and defined('$::selinux_current_mode') and $::selinux_current_mode == 'permissive' {
if $_real_mode == 'disabled' and $facts['selinux_current_mode'] == 'permissive' {
notice('A reboot is required to fully disable SELinux. SELinux will operate in Permissive mode until a reboot')
}
}
Expand All @@ -71,7 +71,7 @@
# a complete relabeling is required when switching from disabled to
# permissive or enforcing. Ensure the autorelabel trigger file is created.
if $_real_mode in ['enforcing','permissive'] and
!$::selinux {
!$facts['selinux'] {
file { '/.autorelabel':
ensure => 'file',
owner => 'root',
Expand Down