opuppet/module-nginx
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

allows setting client_body/header_timeout on vhosts

Browse source
This commit is contained in:
eholzbach 2014-06-25 11:55:26 -07:00
parent a861f23778
commit 508e9e8d62
3 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
manifests/resource/vhost.pp
View file

@ -90,6 +90,10 @@
# [*auth_basic_user_file*] - This directive sets the htpasswd filename for # [*auth_basic_user_file*] - This directive sets the htpasswd filename for
# the authentication realm. # the authentication realm.
# [*client_max_body_size*] - This directive sets client_max_body_size. # [*client_max_body_size*] - This directive sets client_max_body_size.
# [*client_body_timeout*] - Sets how long the server will wait for a
# client body. Default is 60s
# [*client_header_timeout*] - Sets how long the server will wait for a
# client header. Default is 60s
# [*vhost_cfg_append*] - It expects a hash with custom directives to # [*vhost_cfg_append*] - It expects a hash with custom directives to
# put after everything else inside vhost # put after everything else inside vhost
# [*vhost_cfg_prepend*] - It expects a hash with custom directives to # [*vhost_cfg_prepend*] - It expects a hash with custom directives to
@ -182,6 +186,8 @@ define nginx::resource::vhost (
$try_files = undef, $try_files = undef,
$auth_basic = undef, $auth_basic = undef,
$auth_basic_user_file = undef, $auth_basic_user_file = undef,
$client_body_timeout = undef,
$client_header_timeout = undef,
$client_max_body_size = undef, $client_max_body_size = undef,
$vhost_cfg_prepend = undef, $vhost_cfg_prepend = undef,
$vhost_cfg_append = undef, $vhost_cfg_append = undef,
@ -335,6 +341,12 @@ define nginx::resource::vhost (
if ($log_by_lua_file != undef) { if ($log_by_lua_file != undef) {
validate_string($log_by_lua_file) validate_string($log_by_lua_file)
} }
if ($client_body_timeout != undef) {
validate_string($client_body_timeout)
}
if ($client_header_timeout != undef) {
validate_string($client_header_timeout)
}
validate_bool($use_default_location) validate_bool($use_default_location)
validate_array($rewrite_rules) validate_array($rewrite_rules)
validate_hash($string_mappings) validate_hash($string_mappings)

6
templates/vhost/vhost_header.erb
View file

@ -11,6 +11,12 @@ server {
<% if defined? @auth_basic_user_file -%> <% if defined? @auth_basic_user_file -%>
auth_basic_user_file <%= @auth_basic_user_file %>; auth_basic_user_file <%= @auth_basic_user_file %>;
<% end -%> <% end -%>
<% if defined? @client_body_timeout -%>
client_body_timeout <%= @client_body_timeout %>;
<% end -%>
<% if defined? @client_header_timeout -%>
client_header_timeout <%= @client_header_timeout %>;
<% end -%>
<% if defined? @client_max_body_size -%> <% if defined? @client_max_body_size -%>
client_max_body_size <%= @client_max_body_size %>; client_max_body_size <%= @client_max_body_size %>;
<% end -%> <% end -%>

6
templates/vhost/vhost_ssl_header.erb
View file

@ -41,6 +41,12 @@ server {
<% if defined? @auth_basic_user_file -%> <% if defined? @auth_basic_user_file -%>
auth_basic_user_file "<%= @auth_basic_user_file %>"; auth_basic_user_file "<%= @auth_basic_user_file %>";
<% end -%> <% end -%>
<% if defined? @client_body_timeout -%>
client_body_timeout <%= @client_body_timeout %>;
<% end -%>
<% if defined? @client_header_timeout -%>
client_header_timeout <%= @client_header_timeout %>;
<% end -%>
<% if defined? @client_max_body_size -%> <% if defined? @client_max_body_size -%>
client_max_body_size <%= @client_max_body_size %>; client_max_body_size <%= @client_max_body_size %>;
<% end -%> <% end -%>