manifests/config.pp

@@ -33,16 +33,16 @@
       # RHEL <= 5 do not support --follow-symlinks with sed
       # ref: @lboynton: http://git.io/QvJ9ww
       /^5/: {
-        $selinux_set_command = "sed -i \"s@^\\(SELINUX=\\).*@\\1${mode}@\" /etc/sysconfig/selinux"
+        $selinux_set_command = "sed -i \"s@^\\(SELINUX=\\).*@\\1${mode}@\" /etc/selinux/config"
       }
       default: {
-        $selinux_set_command = "sed -i --follow-symlinks \"s@^\\(SELINUX=\\).*@\\1${mode}@\" /etc/sysconfig/selinux"
+        $selinux_set_command = "sed -i --follow-symlinks \"s@^\\(SELINUX=\\).*@\\1${mode}@\" /etc/selinux/config"
       }
     }
 
     exec { "set-selinux-config-to-${mode}":
       command => $selinux_set_command,
-      unless  => "grep -q \"SELINUX=${mode}\" /etc/sysconfig/selinux",
+      unless  => "grep -q \"SELINUX=${mode}\" /etc/selinux/config",
     }
 
     case $mode {
@@ -61,8 +61,9 @@
     }
 
     exec { "change-selinux-status-to-${mode}":
-      command => "echo ${sestatus} > /${::selinux::params::sx_fs_mount}/enforce",
-      unless  => "grep -q '${sestatus}' /${::selinux::params::sx_fs_mount}/enforce",
+      command => "setenforce ${sestatus}",
+      unless  => "getenforce | grep -qi ${mode}",
+      path    => '/bin:/usr/bin:/usr/sbin',
     }
   } else {
     fail("Invalid mode specified for SELinux: ${mode}")

manifests/module.pp

@@ -47,17 +47,17 @@
   }
 
   exec { "${name}-checkloaded":
-    refreshonly   => false,
-    creates       => "/etc/selinux/${::selinux_config_policy}/modules/active/modules/${name}.pp",
-    command       => 'true',
-    notify        => Exec["${name}-buildmod"],
+    refreshonly => false,
+    creates     => "/etc/selinux/${::selinux_config_policy}/modules/active/modules/${name}.pp",
+    command     => 'true',
+    notify      => Exec["${name}-buildmod"],
   }
 
   ## Begin Configuration
   file { "${::selinux::params::sx_mod_dir}/${name}.te":
-    ensure  => $ensure,
-    source  => $source,
-    tag     => 'selinux-module',
+    ensure => $ensure,
+    source => $source,
+    tag    => 'selinux-module',
   }
   if !$use_makefile {
     file { "${::selinux::params::sx_mod_dir}/${name}.mod":

manifests/restorecond/config.pp

@@ -18,8 +18,8 @@
   }
 
   concat::fragment {'restorecond_config_default':
-    target  => $selinux::restorecond::config_file,
-    source  => 'puppet:///modules/selinux/restorecond.conf',
-    order   => '05'
+    target => $selinux::restorecond::config_file,
+    source => 'puppet:///modules/selinux/restorecond.conf',
+    order  => '05'
   }
 }

metadata.json

@@ -1,12 +1,30 @@
 {
 "name": "jfryman/selinux",
-"version": "0.2.0",
+"version": "0.2.2",
 "author": "jfryman",
 "summary": "This class manages SELinux on RHEL based systems",
 "license": "Apache 2.0",
 "source": "https://github.com/jfryman/puppet-selinux",
 "project_page": "https://github.com/jfryman/puppet-selinux",
 "issues_url": "https://github.com/jfryman/puppet-selinux/issues",
+"operatingsystem_support": [
+  {
+    "operatingsystem": "RedHat",
+    "operatingsystemrelease": [
+      "5",
+      "6",
+      "7"
+    ]
+  },
+  {
+    "operatingsystem": "Fedora",
+    "operatingsystemrelease": [
+      "19",
+      "20",
+      "21"
+    ]
+  }
+],
 "dependencies": [
     {
       "name": "puppetlabs/stdlib",