From a4ab39ea8247df54de4b9c196f9886f0c238b911 Mon Sep 17 00:00:00 2001
From: Yaroslav Halchenko <debian@onerussian.com>
Date: Sun, 10 Nov 2013 00:24:24 -0800
Subject: [PATCH] minor jail.conf tune ups.  More needed to adopt the
 jails/filter added upstrean

---
 debian/changelog |  6 +++++-
 debian/jail.conf | 20 +++++++++++++++-----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 539fdace..7c9c2c70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,12 @@ fail2ban (0.8.11~pre1+git29-gccd2657-1) unstable; urgency=low
   * debian/watch
     - restrict version matching only to numbers and period (to exclude
       alpha releases of 0.9 series)
+  * debian/jail.conf
+    - slightly adjusted for changes in master (suhosin replaced
+      lighttpd-auth filer name, and postfix-sasl for sasl)
+    - added nginx-http-auth.  More jails to be adopted from upsream.
 
- --
+ -- Yaroslav Halchenko <debian@onerussian.com>  Sun, 10 Nov 2013 00:23:24 -0800
 
 fail2ban (0.8.10-3) unstable; urgency=low
 
diff --git a/debian/jail.conf b/debian/jail.conf
index ec348e31..48827e01 100644
--- a/debian/jail.conf
+++ b/debian/jail.conf
@@ -56,6 +56,10 @@ usedns = warn
 # jail.{conf,local} configuration files.
 destemail = root@localhost
 
+#
+# Name of the sender for mta actions
+sendername = Fail2Ban
+
 #
 # ACTIONS
 #
@@ -85,12 +89,12 @@ action_ = %(banaction)s[name=%(__name__)s, port="%(port)s", protocol="%(protocol
 
 # ban & send an e-mail with whois report to the destemail.
 action_mw = %(banaction)s[name=%(__name__)s, port="%(port)s", protocol="%(protocol)s", chain="%(chain)s"]
-              %(mta)s-whois[name=%(__name__)s, dest="%(destemail)s", protocol="%(protocol)s", chain="%(chain)s"]
+              %(mta)s-whois[name=%(__name__)s, dest="%(destemail)s", protocol="%(protocol)s", chain="%(chain)s", sendername="%(sendername)s"]
 
 # ban & send an e-mail with whois report and relevant log lines
 # to the destemail.
 action_mwl = %(banaction)s[name=%(__name__)s, port="%(port)s", protocol="%(protocol)s", chain="%(chain)s"]
-               %(mta)s-whois-lines[name=%(__name__)s, dest="%(destemail)s", logpath=%(logpath)s, chain="%(chain)s"]
+               %(mta)s-whois-lines[name=%(__name__)s, dest="%(destemail)s", logpath=%(logpath)s, chain="%(chain)s", sendername="%(sendername)s"]
 
 # Choose default action.  To change, just override value of 'action' with the
 # interpolation to the chosen action shortcut (e.g.  action_mw, action_mwl, etc) in jail.local
@@ -266,9 +270,16 @@ logpath = /var/log/lighttpd/error.log
 
 enabled = false
 port    = http,https
-filter  = lighttpd-auth
+filter  = suhosin
 logpath = /var/log/lighttpd/error.log
 
+[nginx-http-auth]
+
+enabled = false
+filter  = nginx-http-auth
+port    = http,https
+logpath = /var/log/nginx/error.log
+
 # Monitor roundcube server
 
 [roundcube-auth]
@@ -370,7 +381,7 @@ logpath  = /var/log/mail.log
 
 enabled  = false
 port     = smtp,ssmtp,submission,imap2,imap3,imaps,pop3,pop3s
-filter   = sasl
+filter   = postfix-sasl
 # You might consider monitoring /var/log/mail.warn instead if you are
 # running postfix since it would provide the same log lines at the
 # "warn" level but overall at the smaller filesize.
@@ -436,7 +447,6 @@ protocol = tcp
 filter   = named-refused
 logpath  = /var/log/named/security.log
 
-
 # Multiple jails, 1 per protocol, are necessary ATM:
 # see https://github.com/fail2ban/fail2ban/issues/37
 [asterisk-tcp]