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

…tion config: refined worker_processes validation
voxpupuli · Apr 10, 2015 · 0cd258b · 0cd258b
2 parents a40dbfd + 810d36d
commit 0cd258b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -94,7 +94,7 @@
 ) inherits ::nginx::params {
 
   ### 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".')
   }
   if (!is_integer($worker_connections)) {

diff --git a/spec/classes/config_spec.rb b/spec/classes/config_spec.rb
@@ -76,6 +76,12 @@
           :value => '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',
           :attr  => 'worker_rlimit_nofile',