Merge remote-tracking branch 'origin/master'
diff --git a/linux/system/selinux.sls b/linux/system/selinux.sls
index 5bbd815..245cc8d 100644
--- a/linux/system/selinux.sls
+++ b/linux/system/selinux.sls
@@ -5,22 +5,12 @@
- linux.system.repo
{%- if grains.os_family == 'RedHat' %}
-
-{%- if system.selinux == 'disabled' %}
- {%- set mode = 'permissive' %}
-{%- else %}
{%- set mode = system.selinux %}
-{%- endif %}
-
-selinux_config:
- cmd.run:
- - name: "sed -i 's/SELINUX=[a-z][a-z]*$/SELINUX={{ system.selinux }}/' /etc/selinux/config"
- - unless: grep 'SELINUX={{ system.selinux }}' /etc/selinux/config
- - require:
- - pkg: linux_repo_prereq_pkgs
{{ mode }}:
- selinux.mode
+ selinux.mode:
+ - require:
+ - pkg: linux_repo_prereq_pkgs
{%- endif %}