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

Merge pull request #323 from saz/multi_accept

Browse source 
add option for multi_accept and events_use
This commit is contained in:
James Fryman 2014-06-04 10:47:24 +02:00
commit 4bc07a43c8
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
manifests/config.pp
View file

@ -17,6 +17,8 @@ class nginx::config(
$worker_processes = $nginx::params::nx_worker_processes,
$worker_connections = $nginx::params::nx_worker_connections,
$worker_rlimit_nofile = $nginx::params::nx_worker_rlimit_nofile,
$multi_accept = $nginx::params::nx_multi_accept,
$events_use = $nginx::params::nx_events_use,
$confd_purge = $nginx::params::nx_confd_purge,
$vhost_purge = $nginx::params::nx_vhost_purge,
$server_tokens = $nginx::params::nx_server_tokens,

6
manifests/init.pp
View file

@ -32,6 +32,8 @@ class nginx (
$worker_processes = $nginx::params::nx_worker_processes,
$worker_connections = $nginx::params::nx_worker_connections,
$worker_rlimit_nofile = $nginx::params::nx_worker_rlimit_nofile,
$multi_accept = $nginx::params::nx_multi_accept,
$events_use = $nginx::params::nx_events_use,
$package_name = $nginx::params::package_name,
$package_ensure = $nginx::params::package_ensure,
$package_source = $nginx::params::package_source,
@ -87,6 +89,8 @@ class nginx (
if (!is_integer($worker_rlimit_nofile)) {
fail('$worker_rlimit_nofile must be an integer.')
}
validate_string($events_use)
validate_string($multi_accept)
validate_string($package_name)
validate_string($package_ensure)
validate_string($package_source)
@ -157,6 +161,8 @@ class nginx (
worker_processes => $worker_processes,
worker_connections => $worker_connections,
worker_rlimit_nofile => $worker_rlimit_nofile,
multi_accept => $multi_accept,
events_use => $events_use,
proxy_set_header => $proxy_set_header,
proxy_http_version => $proxy_http_version,
proxy_cache_path => $proxy_cache_path,

10
templates/conf.d/nginx.conf.erb
View file

@ -6,9 +6,13 @@ error_log <%= @nginx_error_log %>;
<% if scope.lookupvar('nginx::params::nx_pid') != false %>pid <%= scope.lookupvar('nginx::params::nx_pid')%>;<% end -%>
events {
worker_connections <%= @worker_connections -%>;
<% if scope.lookupvar('nginx::params::nx_multi_accept') == 'on' %>multi_accept on;<% end -%>
<% if scope.lookupvar('nginx::params::nx_events_use') %>use <%= scope.lookupvar('nginx::params::nx_events_use')%>;<% end -%>
worker_connections <%= @worker_connections -%>;
<% if @multi_accept == 'on' -%>
multi_accept on;
<% end -%>
<% if @events_use -%>
use <%= @events_use %>;
<% end -%>
}
http {