Merge pull request #664 from bmjen/fix-ci

Fixes SELinux compatibility with EL6
puppetlabs · Dec 2, 2016 · 5b2f1f1 · 5b2f1f1
2 parents c7dd699 + 63e5ca8
commit 5b2f1f1
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/manifests/linux/redhat.pp b/manifests/linux/redhat.pp
@@ -76,12 +76,13 @@
       #lint:ignore:quoted_booleans
       'true',true: {
         case $::operatingsystemrelease {
-          /^(6|7)\..*/: {
+          /^7\..*/: {
             case $::operatingsystem {
               'CentOS': { File["/etc/sysconfig/${service_name}"] { seluser => 'unconfined_u', seltype => 'system_conf_t' } }
               default : { File["/etc/sysconfig/${service_name}"] { seluser => 'unconfined_u', seltype => 'etc_t' } }
             }
           }
+          /^6\..*/:     { File["/etc/sysconfig/${service_name}"] { seluser => 'unconfined_u', seltype => 'system_conf_t' } }
           default:      { File["/etc/sysconfig/${service_name}"] { seluser => 'system_u', seltype => 'system_conf_t' } }
         }
       }