Merge pull request voxpupuli#183 from drfeelngood/nx_daemon_user_for_…

…oracle_linux Update params to account for oracle linux.
cegeka · Nov 22, 2013 · 3a1b487 · 3a1b487
2 parents 5f31637 + 8da21ee
commit 3a1b487
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/manifests/package/redhat.pp b/manifests/package/redhat.pp
@@ -26,7 +26,7 @@
       # fedora 19 has 1.4.x packages are in
 
       # fedora 18 users will need to supply their own nginx 1.4 rpms and/or repo
-      if $::lsbmajdistrelease < 19 {
+      if $::lsbmajdistrelease and $::lsbmajdistrelease < 19 {
         notice("${::operatingsystem} ${::lsbmajdistrelease} does not supply nginx >= 1.4 packages")
       }
     }

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -68,9 +68,18 @@
     /(?i-mx:linux)/  => '/var/run/nginx.pid',
   }
 
-  $nx_daemon_user = $::operatingsystem ? {
-    /(?i-mx:debian|ubuntu)/                                                    => 'www-data',
-    /(?i-mx:fedora|rhel|redhat|centos|scientific|suse|opensuse|amazon|gentoo)/ => 'nginx',
+  if $::osfamily {
+    $nx_daemon_user = $::osfamily ? {
+      /(?i-mx:redhat|suse|gentoo|linux)/ => 'nginx',
+      /(?i-mx:debian)/                   => 'www-data',
+    }
+  } else {
+    warning('$::osfamily not defined. Support for $::operatingsystem is deprecated')
+    warning("Please upgrade from factor ${::facterversion} to >= 1.7.2")
+    $nx_daemon_user = $::operatingsystem ? {
+      /(?i-mx:debian|ubuntu)/                                                                => 'www-data',
+      /(?i-mx:fedora|rhel|redhat|centos|scientific|suse|opensuse|amazon|gentoo|oraclelinux)/ => 'nginx',
+    }
   }
 
   # Service restart after Nginx 0.7.53 could also be just