Tidy up mod_evasive configuration

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

diff --git a/cookbooks/apache/attributes/default.rb b/cookbooks/apache/attributes/default.rb
index 73184f049563b0ad388689f0341cff0bd3cfa44b..a9cde038c5f0bdc212981a9dd609331ed09e535d 100644 (file)
--- a/cookbooks/apache/attributes/default.rb
+++ b/cookbooks/apache/attributes/default.rb
@@ -1,4 +1,4 @@
-default[:apache][:mpm] = "worker"
+default[:apache][:mpm] = "event"
 
 default[:apache][:timeout] = 300
 
@@ -7,23 +7,33 @@ 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][:max_clients] = 150
-default[:apache][:prefork][:max_requests_per_child] = 0
+default[:apache][:prefork][:max_request_workers] = 150
+default[:apache][:prefork][:max_connections_per_child] = 0
 
 default[:apache][:worker][:start_servers] = 2
 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_clients] = 150
-default[:apache][:worker][:max_requests_per_child] = 0
+default[:apache][:worker][:max_request_workers] = 150
+default[:apache][:worker][:max_connections_per_child] = 0
 
 default[:apache][:event][:start_servers] = 2
-default[:apache][:event][:max_clients] = 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][:buffered_logs] = true
+
+default[:apache][:evasive][:enable] = true
+default[:apache][:evasive][:hash_table_size] = 65536
+default[:apache][:evasive][:page_count] = 50
+default[:apache][:evasive][:site_count] = 250
+default[:apache][:evasive][:page_interval] = 1
+default[:apache][:evasive][:site_interval] = 1
+default[:apache][:evasive][:blocking_period] = 60