Merge pull request #382 from 3flex/294-fix-proxy_cache_levels-validation

Correct validation of {proxy,fastcgi}_cache_levels
voxpupuli · Sep 3, 2014 · a931ef5 · a931ef5
2 parents 8a7aeb8 + 7a0d717
commit a931ef5
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -131,19 +131,15 @@
   if ($proxy_cache_path != false) {
     validate_string($proxy_cache_path)
   }
-  if (!is_integer($proxy_cache_levels)) {
-    fail('$proxy_cache_levels must be an integer.')
-  }
+  validate_re($proxy_cache_levels, '^[12](:[12])*$')
   validate_string($proxy_cache_keys_zone)
   validate_string($proxy_cache_max_size)
   validate_string($proxy_cache_inactive)
 
   if ($fastcgi_cache_path != false) {
         validate_string($fastcgi_cache_path)
   }
-  if (!is_integer($fastcgi_cache_levels)) {
-    fail('$fastcgi_cache_levels must be an integer.')
-  }
+  validate_re($fastcgi_cache_levels, '^[12](:[12])*$')
   validate_string($fastcgi_cache_keys_zone)
   validate_string($fastcgi_cache_max_size)
   validate_string($fastcgi_cache_inactive)