mediawiki: add apache request duration logging

[chef.git] / cookbooks / fail2ban / templates / default / jail.erb

diff --git a/cookbooks/fail2ban/templates/default/jail.erb b/cookbooks/fail2ban/templates/default/jail.erb
index 20010d1b217854e12304a2983fa729811f45edb1..6a7e377d82632cdbe2705fd90b7674f3a27f3925 100644 (file)
--- a/cookbooks/fail2ban/templates/default/jail.erb
+++ b/cookbooks/fail2ban/templates/default/jail.erb
@@ -1,20 +1,28 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
-[DEFAULT]
-destemail = admins@openstreetmap.org
-banaction = shorewall
-bantime = 14400
-<% @jails.each do |jail| -%>
-
-[<%= jail[:name] %>]
+[<%= @name %>]
 enabled = true
-<% if jail[:protocol] -%>
-protocol = <%= jail[:protocol] %>
+<% if @protocol -%>
+protocol = <%= @protocol %>
+<% end -%>
+<% if @ports -%>
+port = <%= @ports.join(",") %>
+<% end -%>
+<% if @filter -%>
+filter = <%= @filter %>
+<% end -%>
+<% if @logpath -%>
+logpath = <%= @logpath %>
+<% end -%>
+<% if @bantime -%>
+bantime = <%= @bantime %>
+<% end -%>
+<% if @findtime -%>
+findtime = <%= @findtime %>
 <% end -%>
-port = <%= jail[:port] %>
-filter = <%= jail[:filter] %>
-logpath = <%= jail[:logpath] %>
-<% if jail[:maxretry] -%>
-maxretry = <%= jail[:maxretry] %>
+<% if @maxretry -%>
+maxretry = <%= @maxretry %>
 <% end -%>
+<% if @ignoreips -%>
+ignoreip = <%= @ignoreips.sort.join(" ") %>
 <% end -%>