Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[keepalive_requests] added keepalive_requests parameter in nginx.conf #873

Merged
merged 1 commit into from
Sep 11, 2016
Merged

[keepalive_requests] added keepalive_requests parameter in nginx.conf #873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions manifests/config.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
$http_tcp_nodelay = 'on',
$http_tcp_nopush = 'off',
$keepalive_timeout = '65',
$keepalive_requests = '100',
$log_format = {},
$mail = false,
$stream = false,
Expand Down
3 changes: 3 additions & 0 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
$http_tcp_nodelay = undef,
$http_tcp_nopush = undef,
$keepalive_timeout = undef,
$keepalive_requests = undef,
$mail = undef,
$multi_accept = undef,
$names_hash_bucket_size = undef,
Expand Down Expand Up @@ -164,6 +165,7 @@
$http_tcp_nodelay or
$http_tcp_nopush or
$keepalive_timeout or
$keepalive_requests or
$logdir or
$log_format or
$mail or
Expand Down Expand Up @@ -247,6 +249,7 @@
http_tcp_nodelay => $http_tcp_nodelay,
http_tcp_nopush => $http_tcp_nopush,
keepalive_timeout => $keepalive_timeout,
keepalive_requests => $keepalive_requests,
log_dir => $logdir,
log_format => $log_format,
mail => $mail,
Expand Down
12 changes: 12 additions & 0 deletions spec/classes/config_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,12 @@
value: '123',
match: ' keepalive_timeout 123;'
},
{
title: 'should set keepalive_requests',
attr: 'keepalive_requests',
value: '345',
match: ' keepalive_requests 345;'
},
{
title: 'should set tcp_nodelay',
attr: 'http_tcp_nodelay',
Expand Down Expand Up @@ -458,6 +464,12 @@
value: '123',
match: ' keepalive_timeout 123;'
},
{
title: 'should set keepalive_requests',
attr: 'keepalive_requests',
value: '345',
match: ' keepalive_requests 345;'
},
{
title: 'should set mail',
attr: 'mail',
Expand Down
1 change: 1 addition & 0 deletions templates/conf.d/nginx.conf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ http {
server_names_hash_max_size <%= @names_hash_max_size %>;

keepalive_timeout <%= @keepalive_timeout %>;
keepalive_requests <%= @keepalive_requests %>;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpick - indentation

tcp_nodelay <%= @http_tcp_nodelay %>;

<% if @gzip == 'on' -%>
Expand Down