apache: set our correct defaults for mod_evasive

diff --git a/cookbooks/apache/attributes/default.rb b/cookbooks/apache/attributes/default.rb
index 793881ea57121c66ae9068e3067f98a4ba6e5047..557085b56b1f64c8923a1df367bc2cd901bf8a91 100644 (file)
--- a/cookbooks/apache/attributes/default.rb
+++ b/cookbooks/apache/attributes/default.rb
@@ -32,8 +32,8 @@ default[:apache][:buffered_logs] = true
 
 default[:apache][:evasive][:enable] = true
 default[:apache][:evasive][:dos_hash_table_size] =  65536
 
 default[:apache][:evasive][:enable] = true
 default[:apache][:evasive][:dos_hash_table_size] =  65536

-default[:apache][:evasive][:dos_page_count]      =  250
-default[:apache][:evasive][:dos_site_count]      =  500
+default[:apache][:evasive][:dos_page_count]      =  50
+default[:apache][:evasive][:dos_site_count]      =  250

 default[:apache][:evasive][:dos_page_interval]   =  1
 default[:apache][:evasive][:dos_site_interval]   =  1
 default[:apache][:evasive][:dos_blocking_period] =  60
 default[:apache][:evasive][:dos_page_interval]   =  1
 default[:apache][:evasive][:dos_site_interval]   =  1
 default[:apache][:evasive][:dos_blocking_period] =  60

diff --git a/roles/wiki.rb b/roles/wiki.rb
index 1e19d9df136d67bfbdc01385e19d1674c6572c4a..9322e27d4facf5b9ef23e6050d8428bbc8bdf429 100644 (file)
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -15,6 +15,10 @@ default_attributes(
       :max_request_workers => 800,
       :threads_per_child => 50,
       :max_connections_per_child => 10000
       :max_request_workers => 800,
       :threads_per_child => 50,
       :max_connections_per_child => 10000

+    },
+    :evasive => {
+      :dos_page_count =>  250,
+      :dos_site_count =>  500

     }
   },
   :elasticsearch => {
     }
   },
   :elasticsearch => {