Merge remote-tracking branch 'remotes/gh-upstream/master' into 0.10

pull/1976/merge
sebres 2017-11-06 18:56:31 +01:00
commit 7e756da2b9
2 changed files with 8 additions and 4 deletions

View File

@ -190,10 +190,11 @@ action_cf_mwl = cloudflare[cfuser="%(cfemail)s", cftoken="%(cfapikey)s"]
# Report block via blocklist.de fail2ban reporting service API
#
# See the IMPORTANT note in action.d/blocklist_de.conf for when to
# use this action. Create a file jail.d/blocklist_de.local containing
# [Init]
# blocklist_de_apikey = {api key from registration]
# See the IMPORTANT note in action.d/blocklist_de.conf for when to use this action.
# Specify expected parameters in file action.d/blocklist_de.local or if the interpolation
# `action_blocklist_de` used for the action, set value of `blocklist_de_apikey`
# in your `jail.local` globally (section [DEFAULT]) or per specific jail section (resp. in
# corresponding jail.d/my-jail.local file).
#
action_blocklist_de = blocklist_de[email="%(sender)s", service=%(filter)s, apikey="%(blocklist_de_apikey)s", agent="%(fail2ban_agent)s"]

View File

@ -18,6 +18,9 @@
# Author: Sireyessire, Cyril Jaquier
#
description="Daemon to ban hosts that cause multiple authentication errors"
description_reload="reload configuration"
description_showlog="show fail2ban logs"
extra_started_commands="reload showlog"
FAIL2BAN="/usr/bin/fail2ban-client ${FAIL2BAN_OPTIONS}"