diff --git a/site/profiles/manifests/puppet/puppetboard.pp b/site/profiles/manifests/puppet/puppetboard.pp index 5d229a0..ec6f164 100644 --- a/site/profiles/manifests/puppet/puppetboard.pp +++ b/site/profiles/manifests/puppet/puppetboard.pp @@ -20,7 +20,6 @@ class profiles::puppet::puppetboard ( Integer $gunicorn_threads = 4, String $nginx_vhost = 'puppetboard.main.unkin.net', Integer $nginx_port = 80, - Boolean $selinux = true, #String[1] $secret_key = "${fqdn_rand_string(32)}", ) { @@ -124,7 +123,7 @@ class profiles::puppet::puppetboard ( # if selinux is defined, manage it - if $selinux { + if $::facts['os']['selinux']['config_mode'] == 'enforcing' { # call the nginx selinux class class { 'profiles::selinux::nginx': diff --git a/site/profiles/manifests/reposync/webserver.pp b/site/profiles/manifests/reposync/webserver.pp index 9321db1..8008968 100644 --- a/site/profiles/manifests/reposync/webserver.pp +++ b/site/profiles/manifests/reposync/webserver.pp @@ -4,7 +4,6 @@ class profiles::reposync::webserver ( String $nginx_vhost = 'repos.main.unkin.net', Integer $nginx_port = 80, Boolean $favicon = true, - Boolean $selinux = true, ) { class { 'nginx': } @@ -39,7 +38,7 @@ class profiles::reposync::webserver ( order => 10, } - if $selinux { + if $::facts['os']['selinux']['config_mode'] == 'enforcing' { # include packages that are required include profiles::packages::selinux diff --git a/site/profiles/manifests/sql/galera_member.pp b/site/profiles/manifests/sql/galera_member.pp index d79c28a..5a6fb94 100644 --- a/site/profiles/manifests/sql/galera_member.pp +++ b/site/profiles/manifests/sql/galera_member.pp @@ -30,7 +30,6 @@ class profiles::sql::galera_member ( Boolean $package_manage = true, String $package_name = 'mariadb-server', Boolean $epel_needed = false, - Boolean $selinux = true, Boolean $manage_repo = true, ) { @@ -59,7 +58,7 @@ class profiles::sql::galera_member ( if length($servers_array) >= 3 { # if selinux is defined, manage it - if $selinux { + if $::facts['os']['selinux']['config_mode'] == 'enforcing' { # set permissive on first run, as we need mariadb installed/started at a custom path before adding fcontext if $::facts['mariadb_acti'] { $selinux_mode = 'enforcing' }else{ $selinux_mode = 'permissive' }