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

Merge pull request #590 from 3flex/540-refine-worker_processes-validation

Browse source 
config: refined worker_processes validation
This commit is contained in:
Matthew Haughton 2015-04-10 12:00:44 -04:00
commit 0cd258b310
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
manifests/config.pp
View file

@ -94,7 +94,7 @@ class nginx::config(
) inherits ::nginx::params { ) inherits ::nginx::params {
### Validations ### ### Validations ###
if (!is_string($worker_processes)) and (!is_integer($worker_processes)) { if ($worker_processes != 'auto') and (!is_integer($worker_processes)) {
fail('$worker_processes must be an integer or have value "auto".') fail('$worker_processes must be an integer or have value "auto".')
} }
if (!is_integer($worker_connections)) { if (!is_integer($worker_connections)) {

6
spec/classes/config_spec.rb
View file

@ -76,6 +76,12 @@ describe 'nginx::config' do
:value => '4', :value => '4',
:match => 'worker_processes 4;', :match => 'worker_processes 4;',
}, },
{
:title => 'should set worker_processes',
:attr => 'worker_processes',
:value => 'auto',
:match => 'worker_processes auto;',
},
{ {
:title => 'should set worker_rlimit_nofile', :title => 'should set worker_rlimit_nofile',
:attr => 'worker_rlimit_nofile', :attr => 'worker_rlimit_nofile',