diff --git a/ldap/manifests/init.pp b/ldap/manifests/init.pp index 0f8200b..81a6e4f 100644 --- a/ldap/manifests/init.pp +++ b/ldap/manifests/init.pp @@ -530,7 +530,7 @@ class ldap::server { } } - if "${selinux}" == "true" { + if $::selinux == "true" { selinux::manage_fcontext { "/srv/ldap(/.*)?": type => "slapd_db_t", before => File["/srv/ldap"], diff --git a/mysql/manifests/init.pp b/mysql/manifests/init.pp index 7f3f1e6..6edd688 100644 --- a/mysql/manifests/init.pp +++ b/mysql/manifests/init.pp @@ -56,7 +56,7 @@ class mysql::server { } } - if "${selinux}" == "true" { + if $::selinux == "true" { selinux::manage_fcontext { "/srv/mysql(/.*)?": type => "mysqld_db_t", before => File["/srv/mysql"], diff --git a/selinux/manifests/init.pp b/selinux/manifests/init.pp index 7133d44..b81e5bc 100644 --- a/selinux/manifests/init.pp +++ b/selinux/manifests/init.pp @@ -177,7 +177,7 @@ define selinux::boolean($value) { # define selinux::manage_fcontext($type, $recurse = true) { - if "${selinux}" == "true" { + if $::selinux == "true" { include selinux::tools @@ -225,7 +225,7 @@ define selinux::manage_fcontext($type, $recurse = true) { # define selinux::manage_port($type, $proto) { - if "${selinux}" == "true" { + if $::selinux == "true" { include selinux::tools @@ -257,7 +257,7 @@ define selinux::manage_port($type, $proto) { # define selinux::module($source) { - if "${selinux}" == "true" { + if $::selinux == "true" { $ext = regsubst($source, '.*\.(te|pp)', '\1') case $ext { diff --git a/syslog/manifests/init.pp b/syslog/manifests/init.pp index d9acab9..2aae4b6 100644 --- a/syslog/manifests/init.pp +++ b/syslog/manifests/init.pp @@ -292,7 +292,7 @@ class syslog::common::standalone inherits syslog::common { require => File["/usr/local/sbin/logarchiver.sh"], } - if "${selinux}" == "true" { + if $::selinux == "true" { selinux::manage_fcontext { "/srv/log(/all\\.log)?": type => "var_log_t", before => File["/srv/log"], diff --git a/tftp/manifests/init.pp b/tftp/manifests/init.pp index 1ff8dc6..338bf3f 100644 --- a/tftp/manifests/init.pp +++ b/tftp/manifests/init.pp @@ -64,7 +64,7 @@ class tftp::server { require => File["/srv/tftpboot"], } - if "${selinux}" == "true" { + if $::selinux == "true" { selinux::manage_fcontext { "/srv/tftpboot(/.*)?": type => "tftpdir_t", before => File["/srv/tftpboot"],