Browse Source

Adjust integers to strings.

As part of merging #501, default values for config.pp were integers. However,
many of the current logic expects to see strings for many values. This commit
fixes things up while the validation logic can be adjusted to take account
integer.
James Fryman 9 years ago
parent
commit
c87744aab9
2 changed files with 15 additions and 15 deletions
  1. 14 14
      manifests/config.pp
  2. 1 1
      metadata.json

+ 14 - 14
manifests/config.pp

@@ -48,7 +48,7 @@ class nginx::config(
   $fastcgi_cache_inactive         = '20m',
   $fastcgi_cache_key              = false,
   $fastcgi_cache_keys_zone        = 'd3:100m',
-  $fastcgi_cache_levels           = 1,
+  $fastcgi_cache_levels           = '1',
   $fastcgi_cache_max_size         = '500m',
   $fastcgi_cache_path             = false,
   $fastcgi_cache_use_stale        = false,
@@ -56,24 +56,24 @@ class nginx::config(
   $http_cfg_append                = false,
   $http_tcp_nodelay               = 'on',
   $http_tcp_nopush                = 'off',
-  $keepalive_timeout              = 65,
+  $keepalive_timeout              = '65',
   $mail                           = false,
   $multi_accept                   = 'off',
-  $names_hash_bucket_size         = 64,
-  $names_hash_max_size            = 512,
+  $names_hash_bucket_size         = '64',
+  $names_hash_max_size            = '512',
   $proxy_buffers                  = '32 4k',
   $proxy_buffer_size              = '8k',
   $proxy_cache_inactive           = '20m',
   $proxy_cache_keys_zone          = 'd2:100m',
-  $proxy_cache_levels             = 1,
+  $proxy_cache_levels             = '1',
   $proxy_cache_max_size           = '500m',
   $proxy_cache_path               = false,
-  $proxy_connect_timeout          = 90,
-  $proxy_headers_hash_bucket_size = 64,
+  $proxy_connect_timeout          = '90',
+  $proxy_headers_hash_bucket_size = '64',
   $proxy_http_version             = '1.0',
-  $proxy_read_timeout             = 90,
+  $proxy_read_timeout             = '90',
   $proxy_redirect                 = 'off',
-  $proxy_send_timeout             = 90,
+  $proxy_send_timeout             = '90',
   $proxy_set_header               = [
     'Host $host',
     'X-Real-IP $remote_addr',
@@ -83,11 +83,11 @@ class nginx::config(
   $server_tokens                  = 'on',
   $spdy                           = 'off',
   $ssl_stapling                   = 'off',
-  $types_hash_bucket_size         = 512,
-  $types_hash_max_size            = 1024,
-  $worker_connections             = 1024,
-  $worker_processes               = 1,
-  $worker_rlimit_nofile           = 1024,
+  $types_hash_bucket_size         = '512',
+  $types_hash_max_size            = '1024',
+  $worker_connections             = '1024',
+  $worker_processes               = '1',
+  $worker_rlimit_nofile           = '1024',
   ### END Nginx Configuration ###
 ) inherits ::nginx::params {
 

+ 1 - 1
metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "jfryman-nginx",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "author": "James Fryman",
   "summary": "Puppet NGINX management module",
   "license": "MIT License",