5 Commits
Author SHA1 Message Date
Javier Bértoli 47f47e784d Bump minor version after issue #14 2013-12-26 16:22:04 -03:00
Javier Bértoli af31e1fe07 Merge branch 'master' of github.com:netmanagers/puppet-fail2ban 2013-12-26 16:17:58 -03:00
Javier Bértoli dab8e07069 Merge pull request #14 from grooverdan/ignore_ip
add ignoreip to jail options
2013-12-26 10:45:44 -08:00
Daniel Black a4b5dae912 add ignoreip to jail options 2013-12-26 11:31:10 +00:00
Javier Bértoli a7458e33ce Release v1.2.2 2013-12-23 18:23:37 -03:00
4 changed files with 16 additions and 1 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
name 'netmanagers-fail2ban' name 'netmanagers-fail2ban'
version '1.2.1' version '1.3.0'
author 'Javier Bertoli' author 'Javier Bertoli'
license 'Apache2' license 'Apache2'
project_page 'http://www.netmanagers.com.ar' project_page 'http://www.netmanagers.com.ar'
+10
View File
@@ -15,6 +15,7 @@
# Defaults to true # Defaults to true
# $filter - The filter rule to use. # $filter - The filter rule to use.
# If empty, defaults to == $jailname. # If empty, defaults to == $jailname.
# $ignoreip - Don't ban a host which matches an address in this list.
# $port - The port to filter. It can be an array of ports. # $port - The port to filter. It can be an array of ports.
# $logpath - The log file to monitor # $logpath - The log file to monitor
# $maxretry - How many fails are acceptable # $maxretry - How many fails are acceptable
@@ -29,6 +30,7 @@ define fail2ban::jail (
$order = '', $order = '',
$status = '', $status = '',
$filter = '', $filter = '',
$ignoreip = '',
$port = '', $port = '',
$action = '', $action = '',
$logpath = '', $logpath = '',
@@ -62,6 +64,14 @@ define fail2ban::jail (
default => $filter, default => $filter,
} }
$array_ignoreip = is_array($ignoreip) ? {
false => $ignoreip ? {
'' => [],
default => [$ignoreip],
},
default => $ignoreip,
}
$array_port = is_array($port) ? { $array_port = is_array($port) ? {
false => $port ? { false => $port ? {
'' => [], '' => [],
+2
View File
@@ -39,6 +39,7 @@ filter = fail2ban::jail
:port => ['42', '43'], :port => ['42', '43'],
:logpath => '/path/to/somelog', :logpath => '/path/to/somelog',
:enable => true, :enable => true,
:ignoreip => [ '10.3.2.0/24', '192.168.56.0/24' ],
:findtime => '9000', :findtime => '9000',
:maxretry => '5', :maxretry => '5',
:bantime => '3600', :bantime => '3600',
@@ -53,6 +54,7 @@ filter = fail2ban::jail
[fail2ban::jail] [fail2ban::jail]
enabled = true enabled = true
filter = fail2ban::jail filter = fail2ban::jail
ignoreip = 10.3.2.0/24 192.168.56.0/24
port = 42,43 port = 42,43
action = iptables[name=SSH, port=ssh, protocol=tcp] action = iptables[name=SSH, port=ssh, protocol=tcp]
mail-whois[name=SSH, dest=yourmail@mail.com] mail-whois[name=SSH, dest=yourmail@mail.com]
+3
View File
@@ -4,6 +4,9 @@ enabled = <%= @real_status %>
<% if @real_filter != '' -%> <% if @real_filter != '' -%>
filter = <%= @real_filter %> filter = <%= @real_filter %>
<% end -%> <% end -%>
<% if @array_ignoreip != [] -%>
ignoreip = <%= @array_ignoreip * ' ' %>
<% end -%>
<% if @array_port != [] -%> <% if @array_port != [] -%>
port = <%= @array_port * ',' %> port = <%= @array_port * ',' %>
<% end -%> <% end -%>