Merge pull request #1 from OmarzT/configurable_parms

added proxy_buffer_size with default value of 8k
voxpupuli · Sep 6, 2013 · b384727 · b384727
2 parents 53b4986 + 4da3e46
commit b384727
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -29,7 +29,8 @@
   $types_hash_bucket_size = $nginx::params::nx_types_hash_bucket_size,
   $client_max_body_size   = $nginx::params::nx_client_max_body_size,
   $proxy_buffers          = $nginx::params::nx_proxy_buffers,
-  $http_cfg_append        = $nginx::params::nx_http_cfg_append
+  $http_cfg_append        = $nginx::params::nx_http_cfg_append,
+  $proxy_buffer_size      = $nginx::params::nx_proxy_buffer_size,
 ) inherits nginx::params {
   File {
     owner => 'root',

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -46,6 +46,7 @@
   $server_tokens          = $nginx::params::nx_server_tokens,
   $client_max_body_size   = $nginx::params::nx_client_max_body_size,
   $proxy_buffers          = $nginx::params::nx_proxy_buffers,
+  $proxy_buffer_size      = $nginx::params::nx_proxy_buffer_size,
   $http_cfg_append        = $nginx::params::nx_http_cfg_append,
   $nginx_vhosts           = {},
   $nginx_upstreams        = {},
@@ -72,6 +73,7 @@
     server_tokens         => $server_tokens,
     client_max_body_size  => $client_max_body_size,
     proxy_buffers         => $proxy_buffers,
+    proxy_buffer_size     => $proxy_buffer_size,
     http_cfg_append       => $http_cfg_append,
     require               => Class['nginx::package'],
     notify                => Class['nginx::service'],

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -58,6 +58,7 @@
   $nx_proxy_read_timeout      = '90'
   $nx_proxy_buffers           = '32 4k'
   $nx_proxy_http_version      = '1.0'
+  $nx_proxy_buffer_size       = '8k'
 
   $nx_logdir = $::kernel ? {
     /(?i-mx:linux)/ => '/var/log/nginx',

diff --git a/templates/conf.d/proxy.conf.erb b/templates/conf.d/proxy.conf.erb
@@ -5,6 +5,7 @@ proxy_connect_timeout   <%= scope.lookupvar('nginx::params::nx_proxy_connect_tim
 proxy_send_timeout      <%= scope.lookupvar('nginx::params::nx_proxy_send_timeout') %>;
 proxy_read_timeout      <%= scope.lookupvar('nginx::params::nx_proxy_read_timeout') %>;
 proxy_buffers           <%= @proxy_buffers %>;
+proxy_buffer_size       <%= @proxy_buffer_size %>;
 proxy_http_version      <%= @proxy_http_version %>;
 <% @proxy_set_header.each do |header| %>
 proxy_set_header        <%= header %>;<% end %>