Rename MaxClients to MaxRequestWorkers

diff --git a/cookbooks/apache/attributes/default.rb b/cookbooks/apache/attributes/default.rb
index 37b87aaf38a74a45e080a54a1ce6f961815255af..25322ca1bb5f5cb370f000454b3d87df677e1bee 100644 (file)
--- a/cookbooks/apache/attributes/default.rb
+++ b/cookbooks/apache/attributes/default.rb
@@ -7,7 +7,7 @@ default[:apache][:keepalive] = true
 default[:apache][:prefork][:start_servers] = 5
 default[:apache][:prefork][:min_spare_servers] = 5
 default[:apache][:prefork][:max_spare_servers] = 10
 default[:apache][:prefork][:start_servers] = 5
 default[:apache][:prefork][:min_spare_servers] = 5
 default[:apache][:prefork][:max_spare_servers] = 10

-default[:apache][:prefork][:max_clients] = 150
+default[:apache][:prefork][:max_request_workers] = 150

 default[:apache][:prefork][:max_requests_per_child] = 0
 
 default[:apache][:worker][:start_servers] = 2
 default[:apache][:prefork][:max_requests_per_child] = 0
 
 default[:apache][:worker][:start_servers] = 2


@@ -15,11 +15,11 @@ default[:apache][:worker][:min_spare_threads] = 25
 default[:apache][:worker][:max_spare_threads] = 75
 default[:apache][:worker][:thread_limit] = 64
 default[:apache][:worker][:threads_per_child] = 25
 default[:apache][:worker][:max_spare_threads] = 75
 default[:apache][:worker][:thread_limit] = 64
 default[:apache][:worker][:threads_per_child] = 25

-default[:apache][:worker][:max_clients] = 150
+default[:apache][:worker][:max_request_workers] = 150

 default[:apache][:worker][:max_requests_per_child] = 0
 
 default[:apache][:event][:start_servers] = 2
 default[:apache][:worker][:max_requests_per_child] = 0
 
 default[:apache][:event][:start_servers] = 2

-default[:apache][:event][:max_clients] = 150
+default[:apache][:event][:max_request_workers] = 150

 default[:apache][:event][:min_spare_threads] = 25
 default[:apache][:event][:max_spare_threads] = 75
 default[:apache][:event][:thread_limit] = 64
 default[:apache][:event][:min_spare_threads] = 25
 default[:apache][:event][:max_spare_threads] = 75
 default[:apache][:event][:thread_limit] = 64

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 -%>
 

diff --git a/roles/dev.rb b/roles/dev.rb
index 07dfdd9401c88cff6458ceacc51d1702342fb2e5..9522ed62f4981426bb2a45404bde57cec8ae341e 100644 (file)
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -90,7 +90,7 @@ default_attributes(
     :timeout => 30,
     :event => {
       :server_limit => 32,
     :timeout => 30,
     :event => {
       :server_limit => 32,

-      :max_clients => 800,
+      :max_request_workers => 800,

       :threads_per_child => 50,
       :max_requests_per_child => 10000
     }
       :threads_per_child => 50,
       :max_requests_per_child => 10000
     }

diff --git a/roles/forum.rb b/roles/forum.rb
index c032d6b70d48a7228a0991e13cf256ed6a2b699f..e9a38146ab28be895cff281fd2d179e8c3a442e8 100644 (file)
--- a/roles/forum.rb
+++ b/roles/forum.rb
@@ -21,7 +21,7 @@ default_attributes(
       :start_servers => 20,
       :min_spare_servers => 20,
       :max_spare_servers => 50,
       :start_servers => 20,
       :min_spare_servers => 20,
       :max_spare_servers => 50,

-      :max_clients => 256
+      :max_request_workers => 256

     }
   }
 )
     }
   }
 )

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index 6e2a75ce4bb337acdbbfb9647ddf0720c8da2497..4a7d40e06fedc63e40d8f717ddd753a4821c6545 100644 (file)
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -18,7 +18,7 @@ default_attributes(
     :keepalive => false,
     :event => {
       :server_limit => 32,
     :keepalive => false,
     :event => {
       :server_limit => 32,

-      :max_clients => 1600,
+      :max_request_workers => 1600,

       :threads_per_child => 50
     }
   },
       :threads_per_child => 50
     }
   },

diff --git a/roles/planet.rb b/roles/planet.rb
index d9f0112bbaacbd4b4aeea042aab62baa5b825240..9d79d8e25dd340f70efbfb91af96cf13d605c0da 100644 (file)
--- a/roles/planet.rb
+++ b/roles/planet.rb
@@ -41,7 +41,7 @@ default_attributes(
     :keepalive => true,
     :event => {
       :server_limit => 20,
     :keepalive => true,
     :event => {
       :server_limit => 20,

-      :max_clients => 1000,
+      :max_request_workers => 1000,

       :threads_per_child => 50,
       :max_spare_threads => 525
     }
       :threads_per_child => 50,
       :max_spare_threads => 525
     }

diff --git a/roles/taginfo.rb b/roles/taginfo.rb
index 4b0fb23bd970fad04192ef3da565124106a7fc1f..a0a3f978731ab56a0c5044e2a4dda48af398d91d 100644 (file)
--- a/roles/taginfo.rb
+++ b/roles/taginfo.rb
@@ -17,7 +17,7 @@ default_attributes(
     :mpm => "event",
     :event => {
       :server_limit => 40,
     :mpm => "event",
     :event => {
       :server_limit => 40,

-      :max_clients => 1000,
+      :max_request_workers => 1000,

       :min_spare_threads => 50,
       :max_spare_threads => 150,
       :threads_per_child => 50,
       :min_spare_threads => 50,
       :max_spare_threads => 150,
       :threads_per_child => 50,

diff --git a/roles/tile.rb b/roles/tile.rb
index 0944b768e8919317007206781b9d4c2d0d5dba08..a126bc169f4cd77fd70fa3e83042648b4d0eafd3 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -15,7 +15,7 @@ default_attributes(
     :timeout => 60,
     :event => {
       :server_limit => 60,
     :timeout => 60,
     :event => {
       :server_limit => 60,

-      :max_clients => 1200,
+      :max_request_workers => 1200,

       :threads_per_child => 20,
       :min_spare_threads => 30,
       :max_spare_threads => 180,
       :threads_per_child => 20,
       :min_spare_threads => 30,
       :max_spare_threads => 180,

diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb
index 971a51b3744ed636d83f971cc97e8a56c8bf2fb3..646735bf23dd14decdbe9937e833aa52963f0e2e 100644 (file)
--- a/roles/web-frontend.rb
+++ b/roles/web-frontend.rb
@@ -6,7 +6,7 @@ default_attributes(
     :mpm => "event",
     :event => {
       :server_limit => 40,
     :mpm => "event",
     :event => {
       :server_limit => 40,

-      :max_clients => 1000,
+      :max_request_workers => 1000,

       :min_spare_threads => 50,
       :max_spare_threads => 150,
       :threads_per_child => 50,
       :min_spare_threads => 50,
       :max_spare_threads => 150,
       :threads_per_child => 50,

diff --git a/roles/wiki.rb b/roles/wiki.rb
index e6d4564e7a504e3984180d5e930de885b6b2b0ca..1ce53771ff64a535f64cbd5d6c15beb5bb68908d 100644 (file)
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -39,7 +39,7 @@ default_attributes(
     :timeout => 30,
     :event => {
       :server_limit => 32,
     :timeout => 30,
     :event => {
       :server_limit => 32,

-      :max_clients => 800,
+      :max_request_workers => 800,

       :threads_per_child => 50,
       :max_requests_per_child => 10000
     }
       :threads_per_child => 50,
       :max_requests_per_child => 10000
     }

diff --git a/roles/yournavigation.rb b/roles/yournavigation.rb
index af79bde1d0620ed2cb32c98ffe8f6fee67f41029..65334df858496d01f19c4a09cad0f10f0d6913c2 100644 (file)
--- a/roles/yournavigation.rb
+++ b/roles/yournavigation.rb
@@ -15,7 +15,7 @@ default_attributes(
       :start_servers => 20,
       :min_spare_servers => 20,
       :max_spare_servers => 50,
       :start_servers => 20,
       :min_spare_servers => 20,
       :max_spare_servers => 50,

-      :max_clients => 256
+      :max_request_workers => 256

     }
   }
 )
     }
   }
 )