github
/
fail2ban
mirror of https://github.com/fail2ban/fail2ban
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master' 

* origin/master:
  ipjailmatches is on one line with its description in man jail.conf
  Added a space between IP address and the following colon
pull/1050/merge
Yaroslav Halchenko 2015-07-26 22:47:20 -04:00
parent 333dd842f9 b566f992a6
commit 65cd218e10
10 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -50,6 +50,8 @@ ver. 0.9.3 (2015/XX/XXX) - wanna-be-released
* filter.d/apache-badbots.conf, filter.d/nginx-botsearch.conf - add * filter.d/apache-badbots.conf, filter.d/nginx-botsearch.conf - add
HEAD method verb HEAD method verb
* Revamp of Travis and coverage automated testing * Revamp of Travis and coverage automated testing
* Added a space between IP address and the following colon
in notification emails for easier text selection
* Character detection heuristics for whois output via optional setting * Character detection heuristics for whois output via optional setting
in mail-whois*.conf. Thanks Thomas Mayer. in mail-whois*.conf. Thanks Thomas Mayer.
Not enabled by default, if _whois_command is set to be Not enabled by default, if _whois_command is set to be

2
man/jail.conf.5
View File

@ -279,7 +279,7 @@ concatenated string of the log file lines of the matches that generated the ban.
.B ipmatches .B ipmatches
As per \fBmatches\fR, but includes all lines for the IP which are contained with the fail2ban persistent database. Therefore the database must be set for this tag to function. As per \fBmatches\fR, but includes all lines for the IP which are contained with the fail2ban persistent database. Therefore the database must be set for this tag to function.
.TP .TP
.B ipjailmatches\ .B ipjailmatches
As per \fBipmatches\fR, but matches are limited for the IP and for the current jail. As per \fBipmatches\fR, but matches are limited for the IP and for the current jail.
.SH "PYTHON ACTION FILES" .SH "PYTHON ACTION FILES"