Merge pull request #280 from ok-devalias/master

SmartOS support

.travis.yml

@@ -21,4 +21,4 @@ matrix:
       env: PUPPET_GEM_VERSION="~> 2.7.0"
       gemfile: .travis/Gemfile
 notifications:
-  email: false
+  email: false  

manifests/params.pp

@@ -22,7 +22,6 @@
   $nx_temp_dir                = '/tmp'
   $nx_run_dir                 = '/var/nginx'
 
-  $nx_conf_dir                = '/etc/nginx'
   $nx_conf_template           = 'nginx/conf.d/nginx.conf.erb'
   $nx_proxy_conf_template     = 'nginx/conf.d/proxy.conf.erb'
   $nx_confd_purge             = false
@@ -46,7 +45,6 @@
   $nx_spdy                    = off
   $nx_ssl_stapling            = off
 
-
   $nx_proxy_redirect          = off
   $nx_proxy_set_header        = [
     'Host $host',
@@ -80,11 +78,20 @@
     /(?i-mx:sunos)/  => '/var/run/nginx.pid',
   }
 
+  $nx_conf_dir = $::kernelversion ? {
+    /(?i-mx:joyent)/ => '/opt/local/etc/nginx',
+    default => '/etc/nginx',
+  }
+
   if $::osfamily {
+    $solaris_nx_daemon_user = $::kernelversion ? {
+      /(?i-mx:joyent)/ => 'www',
+      default => 'webservd',
+    }
     $nx_daemon_user = $::osfamily ? {
       /(?i-mx:redhat|suse|gentoo|linux)/ => 'nginx',
       /(?i-mx:debian)/                   => 'www-data',
-      /(?i-mx:solaris)/                  => 'webservd',
+      /(?i-mx:solaris)/                  => $solaris_nx_daemon_user,
     }
   } else {
     warning('$::osfamily not defined. Support for $::operatingsystem is deprecated')

templates/conf.d/nginx.conf.erb

@@ -12,7 +12,7 @@ events {
 }
 
 http {
-  include       /etc/nginx/mime.types;
+  include       <%= scope.lookupvar('nginx::params::nx_conf_dir') %>/mime.types;
   default_type  application/octet-stream;
 
   access_log  <%= @http_access_log %>;
@@ -44,12 +44,12 @@ http {
 <% end -%>
 <% end -%>
 
-  include /etc/nginx/conf.d/*.conf;
+  include <%= scope.lookupvar('nginx::params::nx_conf_dir') %>/conf.d/*.conf;
   include <%= scope.lookupvar('nginx::params::nx_conf_dir') %>/sites-enabled/*;
 
 }
 <% if scope.lookupvar('nginx::mail') %>
 mail {
-  include /etc/nginx/conf.mail.d/*.conf;
+  include <%= scope.lookupvar('nginx::params::nx_conf_dir') %>/conf.mail.d/*.conf;
 }
 <% end -%>