Merge remote-tracking branch 'origin/master'

linux/system/selinux.sls

@@ -5,22 +5,12 @@ include:
 - 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 %}