Make sure chef mysql configuration overrides defaults

[chef.git] / cookbooks / apache / attributes / default.rb

diff --git a/cookbooks/apache/attributes/default.rb b/cookbooks/apache/attributes/default.rb
index 25322ca1bb5f5cb370f000454b3d87df677e1bee..8e051057f8ccb88699c50a65caa81408103f8492 100644 (file)
--- a/cookbooks/apache/attributes/default.rb
+++ b/cookbooks/apache/attributes/default.rb
@@ -8,7 +8,7 @@ default[:apache][:prefork][:start_servers] = 5
 default[:apache][:prefork][:min_spare_servers] = 5
 default[:apache][:prefork][:max_spare_servers] = 10
 default[:apache][:prefork][:max_request_workers] = 150
-default[:apache][:prefork][:max_requests_per_child] = 0
+default[:apache][:prefork][:max_connections_per_child] = 0
 
 default[:apache][:worker][:start_servers] = 2
 default[:apache][:worker][:min_spare_threads] = 25
@@ -16,19 +16,16 @@ default[:apache][:worker][:max_spare_threads] = 75
 default[:apache][:worker][:thread_limit] = 64
 default[:apache][:worker][:threads_per_child] = 25
 default[:apache][:worker][:max_request_workers] = 150
-default[:apache][:worker][:max_requests_per_child] = 0
+default[:apache][:worker][:max_connections_per_child] = 0
 
 default[:apache][:event][:start_servers] = 2
-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][:threads_per_child] = 25
-default[:apache][:event][:max_requests_per_child] = 0
+default[:apache][:event][:max_request_workers] = 150
+default[:apache][:event][:max_connections_per_child] = 0
 
 default[:apache][:listen_address] = "*"
 
-default[:apache][:ssl][:certificate] = "openstreetmap"
-default[:apache][:ssl][:certificate_chain] = "rapidssl"
-
 default[:apache][:buffered_logs] = true