Merge pull request #54 from raoulbhatia/multi_accept

Correct multi_accept implementation.

Author: javierbertoli

manifests/init.pp

@@ -146,6 +146,10 @@
 # [*worker_connections*]
 #   Specified worker connections number. Default is 1024.
 #
+# [*multi_accept*]
+#   Activate or deactivate the usage of multi_accept.
+#   Default is on but it is then commented out in the default nginx template.
+#
 # [*keepalive_timeout*]
 #   Specified keepalive timeout. Default is 65(ms).
 #
@@ -237,6 +241,7 @@
 class nginx (
   $gzip                = params_lookup( 'gzip' ),
   $worker_connections  = params_lookup( 'worker_connections' ),
+  $multi_accept        = params_lookup( 'multi_accept' ),
   $keepalive_timeout   = params_lookup( 'keepalive_timeout' ),
   $server_names_hash_max_size     = params_lookup( 'server_names_hash_max_size' ),
   $server_names_hash_bucket_size  = params_lookup( 'server_names_hash_bucket_size' ),

manifests/params.pp

@@ -16,6 +16,7 @@
 
   $gzip = 'on'
   $worker_connections = 1024
+  $multi_accept = 'on'
   $keepalive_timeout = 65
   $client_max_body_size = '10m'
   $server_names_hash_max_size = 512

spec/classes/nginx_spec.rb

@@ -91,7 +91,7 @@
 
 events {
   worker_connections 1024;
-  # 
+  # multi_accept on;
 }
 
 http {

templates/conf.d/nginx.conf.erb

@@ -7,7 +7,7 @@ pid        <%= scope.lookupvar('nginx::pid_file')%>;
 
 events {
   worker_connections <%= scope.lookupvar('nginx::worker_connections')%>;
-  # <% if scope.lookupvar('nginx::nx_multi_accept') == 'on' %>multi_accept on;<% end %>
+  # <% if scope.lookupvar('nginx::multi_accept') == 'on' %>multi_accept on;<% end %>
 }
 
 http {