opuppet/module-nginx
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

SmartOS support

Browse source
This commit is contained in:
Joshua Moore 2014-03-24 17:07:38 -04:00
parent 3bc96ed8e4
commit 6fe431f698
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
manifests/params.pp
View file

@ -81,7 +81,7 @@ class nginx::params {
$nx_conf_dir = $::kernelversion ? {
/(?i-mx:joyent)/ => '/opt/local/etc/nginx',
default => '/etc/nginx/',
default => '/etc/nginx',
}
if $::osfamily {

2
templates/conf.d/nginx.conf.erb
View file

@ -50,6 +50,6 @@ http {
}
<% 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 -%>