Rename MaxClients to MaxRequestWorkers

[chef.git] / 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 f2060f45e25044eee8a7e98536c626dfc4dce267..f181ba7cf5612f348ff31833dfb8b61445208559 100644 (file)
--- a/cookbooks/apache/templates/default/httpd.conf.erb
+++ b/cookbooks/apache/templates/default/httpd.conf.erb
@@ -14,7 +14,7 @@ ServerLimit <%= node[:apache][:prefork][:server_limit] %>
 <% end -%>
 MinSpareServers <%= node[:apache][:prefork][:min_spare_servers] %>
 MaxSpareServers <%= node[:apache][:prefork][:max_spare_servers] %>
 <% end -%>
 MinSpareServers <%= node[:apache][:prefork][:min_spare_servers] %>
 MaxSpareServers <%= node[:apache][:prefork][:max_spare_servers] %>

-MaxClients <%= node[:apache][:prefork][:max_clients] %>
+MaxRequestWorkers <%= node[:apache][:prefork][:max_request_workers] %>

 MaxRequestsPerChild <%= node[:apache][:prefork][:max_requests_per_child] %>
 <% end -%>
 <% if node[:apache][:mpm] == "worker" -%>
 MaxRequestsPerChild <%= node[:apache][:prefork][:max_requests_per_child] %>
 <% end -%>
 <% if node[:apache][:mpm] == "worker" -%>


@@ -28,7 +28,7 @@ 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] %>
 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] %>
+MaxRequestWorkers <%= node[:apache][:worker][:max_request_workers] %>

 MaxRequestsPerChild <%= node[:apache][:worker][:max_requests_per_child] %>
 <% end -%>
 <% if node[:apache][:mpm] == "event" -%>
 MaxRequestsPerChild <%= node[:apache][:worker][:max_requests_per_child] %>
 <% end -%>
 <% if node[:apache][:mpm] == "event" -%>


@@ -42,7 +42,7 @@ 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] %>
 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] %>
+MaxRequestWorkers <%= node[:apache][:event][:max_request_workers] %>

 MaxRequestsPerChild <%= node[:apache][:event][:max_requests_per_child] %>
 <% end -%>
 
 MaxRequestsPerChild <%= node[:apache][:event][:max_requests_per_child] %>
 <% end -%>