Tidy up mod_evasive configuration

diff --git a/cookbooks/apache/attributes/default.rb b/cookbooks/apache/attributes/default.rb
index 557085b56b1f64c8923a1df367bc2cd901bf8a91..a9cde038c5f0bdc212981a9dd609331ed09e535d 100644 (file)
--- a/cookbooks/apache/attributes/default.rb
+++ b/cookbooks/apache/attributes/default.rb
@@ -31,9 +31,9 @@ default[:apache][:listen_address] = "*"
 default[:apache][:buffered_logs] = true
 
 default[:apache][:evasive][:enable] = true
-default[:apache][:evasive][:dos_hash_table_size] =  65536
-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][: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

diff --git a/cookbooks/apache/templates/default/evasive.conf.erb b/cookbooks/apache/templates/default/evasive.conf.erb
index d3014825d6dda5a478149f1bed42d8164e9beff8..0f6b37b08252fc9bd333a778f75535737bf07ea9 100644 (file)
--- a/cookbooks/apache/templates/default/evasive.conf.erb
+++ b/cookbooks/apache/templates/default/evasive.conf.erb
@@ -1,10 +1,10 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 <IfModule mod_evasive20.c>
-    DOSHashTableSize    <%= node[:apache][:evasive][:dos_hash_table_size] %>
-    DOSPageCount        <%= node[:apache][:evasive][:dos_page_count] %>
-    DOSSiteCount        <%= node[:apache][:evasive][:dos_site_count] %>
-    DOSPageInterval     <%= node[:apache][:evasive][:dos_page_interval] %>
-    DOSSiteInterval     <%= node[:apache][:evasive][:dos_site_interval] %>
-    DOSBlockingPeriod   <%= node[:apache][:evasive][:dos_blocking_period] %>
+    DOSHashTableSize <%= node[:apache][:evasive][:hash_table_size] %>
+    DOSPageCount <%= node[:apache][:evasive][:page_count] %>
+    DOSSiteCount <%= node[:apache][:evasive][:site_count] %>
+    DOSPageInterval <%= node[:apache][:evasive][:page_interval] %>
+    DOSSiteInterval <%= node[:apache][:evasive][:site_interval] %>
+    DOSBlockingPeriod <%= node[:apache][:evasive][:blocking_period] %>
 </IfModule>

diff --git a/roles/wiki.rb b/roles/wiki.rb
index 9322e27d4facf5b9ef23e6050d8428bbc8bdf429..0c83be4c5ed6e4f16c7093e339e46fa66e91c3a7 100644 (file)
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -17,8 +17,8 @@ default_attributes(
       :max_connections_per_child => 10000
     },
     :evasive => {
-      :dos_page_count =>  250,
-      :dos_site_count =>  500
+      :page_count => 250,
+      :site_count => 500
     }
   },
   :elasticsearch => {