X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/7155c00477d8ea2919730489c4bd354df0751bf1..7013f21316fbdc86a8a36c7aea7f908878db6ef7:/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 f2060f45e..9c80314b0 100644 --- a/cookbooks/apache/templates/default/httpd.conf.erb +++ b/cookbooks/apache/templates/default/httpd.conf.erb @@ -14,8 +14,8 @@ ServerLimit <%= node[:apache][:prefork][:server_limit] %> <% end -%> MinSpareServers <%= node[:apache][:prefork][:min_spare_servers] %> MaxSpareServers <%= node[:apache][:prefork][:max_spare_servers] %> -MaxClients <%= node[:apache][:prefork][:max_clients] %> -MaxRequestsPerChild <%= node[:apache][:prefork][:max_requests_per_child] %> +MaxRequestWorkers <%= node[:apache][:prefork][:max_request_workers] %> +MaxConnectionsPerChild <%= node[:apache][:prefork][:max_connections_per_child] %> <% end -%> <% if node[:apache][:mpm] == "worker" -%> @@ -28,8 +28,8 @@ MinSpareThreads <%= node[:apache][:worker][:min_spare_threads] %> MaxSpareThreads <%= node[:apache][:worker][:max_spare_threads] %> ThreadLimit <%= node[:apache][:worker][:thread_limit] %> ThreadsPerChild <%= node[:apache][:worker][:threads_per_child] %> -MaxClients <%= node[:apache][:worker][:max_clients] %> -MaxRequestsPerChild <%= node[:apache][:worker][:max_requests_per_child] %> +MaxRequestWorkers <%= node[:apache][:worker][:max_request_workers] %> +MaxConnectionsPerChild <%= node[:apache][:worker][:max_connections_per_child] %> <% end -%> <% if node[:apache][:mpm] == "event" -%> @@ -42,8 +42,8 @@ MinSpareThreads <%= node[:apache][:event][:min_spare_threads] %> MaxSpareThreads <%= node[:apache][:event][:max_spare_threads] %> ThreadLimit <%= node[:apache][:event][:thread_limit] %> ThreadsPerChild <%= node[:apache][:event][:threads_per_child] %> -MaxClients <%= node[:apache][:event][:max_clients] %> -MaxRequestsPerChild <%= node[:apache][:event][:max_requests_per_child] %> +MaxRequestWorkers <%= node[:apache][:event][:max_request_workers] %> +MaxConnectionsPerChild <%= node[:apache][:event][:max_connections_per_child] %> <% end -%> # Default to UTF-8