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

Fixup for matching $kernelversion on Joyent

Browse source 
This replaces the code that used to exist and now accommodates FreeBSD
using the $kernel fact, but still allows Joyent selection from
$kernelversion.
This commit is contained in:
Zach Leslie 2014-07-28 11:32:59 -07:00
parent b939e92624
commit 305c439bc6
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
manifests/params.pp
View file

@ -91,10 +91,12 @@ class nginx::params {
/(?i-mx:freebsd)/ => '/var/run/nginx.pid',
}
$nx_conf_dir = $::kernel ? {
/(?i-mx:joyent)/ => '/opt/local/etc/nginx',
/(?i-mx:freebsd)/ => '/usr/local/etc/nginx',
default => '/etc/nginx',
$nx_conf_dir = $::kernelversion ? {
/(?i-mx:joyent)/ => '/opt/local/etc/nginx',
default => $::kernel ? {
/(?i-mx:freebsd)/ => '/usr/local/etc/nginx',
default => '/etc/nginx',
}
}
if $::osfamily {