X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/3f0adbf98daf65d842dc28bf372fba289f6c74ec..eae105ed027c2c1323e413e2c85560988dc2aeec:/cookbooks/apache/templates/default/httpd.conf.erb diff --git a/cookbooks/apache/templates/default/httpd.conf.erb b/cookbooks/apache/templates/default/httpd.conf.erb index f181ba7cf..add175aa2 100644 --- a/cookbooks/apache/templates/default/httpd.conf.erb +++ b/cookbooks/apache/templates/default/httpd.conf.erb @@ -15,7 +15,7 @@ ServerLimit <%= node[:apache][:prefork][:server_limit] %> MinSpareServers <%= node[:apache][:prefork][:min_spare_servers] %> MaxSpareServers <%= node[:apache][:prefork][:max_spare_servers] %> MaxRequestWorkers <%= node[:apache][:prefork][:max_request_workers] %> -MaxRequestsPerChild <%= node[:apache][:prefork][:max_requests_per_child] %> +MaxConnectionsPerChild <%= node[:apache][:prefork][:max_connections_per_child] %> <% end -%> <% if node[:apache][:mpm] == "worker" -%> @@ -29,7 +29,7 @@ MaxSpareThreads <%= node[:apache][:worker][:max_spare_threads] %> ThreadLimit <%= node[:apache][:worker][:thread_limit] %> ThreadsPerChild <%= node[:apache][:worker][:threads_per_child] %> MaxRequestWorkers <%= node[:apache][:worker][:max_request_workers] %> -MaxRequestsPerChild <%= node[:apache][:worker][:max_requests_per_child] %> +MaxConnectionsPerChild <%= node[:apache][:worker][:max_connections_per_child] %> <% end -%> <% if node[:apache][:mpm] == "event" -%> @@ -43,7 +43,10 @@ MaxSpareThreads <%= node[:apache][:event][:max_spare_threads] %> ThreadLimit <%= node[:apache][:event][:thread_limit] %> ThreadsPerChild <%= node[:apache][:event][:threads_per_child] %> MaxRequestWorkers <%= node[:apache][:event][:max_request_workers] %> -MaxRequestsPerChild <%= node[:apache][:event][:max_requests_per_child] %> +MaxConnectionsPerChild <%= node[:apache][:event][:max_connections_per_child] %> +<% if node[:apache][:event][:async_request_worker_factor] -%> +AsyncRequestWorkerFactor <%= node[:apache][:event][:async_request_worker_factor] %> +<% end -%> <% end -%> # Default to UTF-8