Merge pull request #1043 from bastelfreak/http_cfg_prepend

change http_cfg_prepend default false->undef
voxpupuli · Mar 8, 2017 · 55f9e3b · 55f9e3b
2 parents 251d0e2 + a41736c
commit 55f9e3b
Showing 1 changed file with 1 addition and 12 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -83,7 +83,7 @@
   $gzip_proxied                   = 'off',
   $gzip_types                     = undef,
   $gzip_vary                      = 'off',
-  $http_cfg_prepend               = false,
+  $http_cfg_prepend               = undef,
   $http_cfg_append                = undef,
   $http_tcp_nodelay               = 'on',
   $http_tcp_nopush                = 'off',
@@ -217,17 +217,6 @@
   }
   validate_string($proxy_buffers)
   validate_string($proxy_buffer_size)
-  if ($http_cfg_prepend != false) {
-    if !(is_hash($http_cfg_prepend) or is_array($http_cfg_prepend)) {
-      fail('$http_cfg_prepend must be either a hash or array')
-    }
-  }
-
-  if ($nginx_cfg_prepend != false) {
-    if !(is_hash($nginx_cfg_prepend) or is_array($nginx_cfg_prepend)) {
-      fail('$nginx_cfg_prepend must be either a hash or array')
-    }
-  }
 
   if !(is_string($http_access_log) or is_array($http_access_log)) {
     fail('$http_access_log must be either a string or array')