Extend search period and ban time for trackpoint jail

diff --git a/cookbooks/fail2ban/resources/jail.rb b/cookbooks/fail2ban/resources/jail.rb
index 3af0960e9727827687aa9bf1facf715f4fcc13a4..c8ff950cfb3588fb877dcbc2883f7b207f94a32d 100644 (file)
--- a/cookbooks/fail2ban/resources/jail.rb
+++ b/cookbooks/fail2ban/resources/jail.rb
@@ -26,6 +26,8 @@ property :filter, :kind_of => String
 property :logpath, :kind_of => String
 property :protocol, :kind_of => String
 property :ports, :kind_of => Array, :default => []
 property :logpath, :kind_of => String
 property :protocol, :kind_of => String
 property :ports, :kind_of => Array, :default => []

+property :bantime, :kind_of => [Integer, String]
+property :findtime, :kind_of => [Integer, String]

 property :maxretry, :kind_of => Integer
 property :ignoreips, :kind_of => Array
 
 property :maxretry, :kind_of => Integer
 property :ignoreips, :kind_of => Array
 

diff --git a/cookbooks/fail2ban/templates/default/jail.erb b/cookbooks/fail2ban/templates/default/jail.erb
index 91978488c5569caaed9f077b6ced382f2ab343ea..6a7e377d82632cdbe2705fd90b7674f3a27f3925 100644 (file)
--- a/cookbooks/fail2ban/templates/default/jail.erb
+++ b/cookbooks/fail2ban/templates/default/jail.erb
@@ -14,6 +14,12 @@ filter = <%= @filter %>
 <% if @logpath -%>
 logpath = <%= @logpath %>
 <% end -%>
 <% if @logpath -%>
 logpath = <%= @logpath %>
 <% end -%>

+<% if @bantime -%>
+bantime = <%= @bantime %>
+<% end -%>
+<% if @findtime -%>
+findtime = <%= @findtime %>
+<% end -%>

 <% if @maxretry -%>
 maxretry = <%= @maxretry %>
 <% end -%>
 <% if @maxretry -%>
 maxretry = <%= @maxretry %>
 <% end -%>

diff --git a/cookbooks/web/recipes/frontend.rb b/cookbooks/web/recipes/frontend.rb
index 84923ee8904a09380d863883a3f87a3300695e7d..ec7ce92f533ea7426483151b3a9ac3fa310b6006 100644 (file)
--- a/cookbooks/web/recipes/frontend.rb
+++ b/cookbooks/web/recipes/frontend.rb
@@ -83,6 +83,8 @@ fail2ban_jail "apache-trackpoints-timeout" do
   filter "apache-trackpoints-timeout"
   logpath "/var/log/apache2/access.log"
   ports [80, 443]
   filter "apache-trackpoints-timeout"
   logpath "/var/log/apache2/access.log"
   ports [80, 443]

+  bantime "12h"
+  findtime "30m"

 end
 
 fail2ban_filter "apache-notes-search" do
 end
 
 fail2ban_filter "apache-notes-search" do