From f2a5720f0a5aeb08ea1797ccfe2520cbc26b8fff Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank@brehm-online.com>
Date: Tue, 23 Feb 2016 18:14:38 +0100
Subject: [PATCH] Current state

---
 colordiffrc                            | 29 ++++++++++++++++++++++++++
 fail2ban/action.d/sendmail-common.conf |  2 ++
 fail2ban/action.d/sendmail-whois.conf  |  2 ++
 fail2ban/action.d/sendmail.conf        |  2 ++
 fail2ban/jail.conf                     | 16 ++++++++------
 5 files changed, 45 insertions(+), 6 deletions(-)
 create mode 100644 colordiffrc

diff --git a/colordiffrc b/colordiffrc
new file mode 100644
index 0000000..4bcb02d
--- /dev/null
+++ b/colordiffrc
@@ -0,0 +1,29 @@
+# Example colordiffrc file for dark backgrounds
+#
+# Set banner=no to suppress authorship info at top of
+# colordiff output
+banner=no
+# By default, when colordiff output is being redirected
+# to a file, it detects this and does not colour-highlight
+# To make the patch file *include* colours, change the option
+# below to 'yes'
+color_patches=no
+# Sometimes it can be useful to specify which diff command to
+# use: that can be specified here
+diff_cmd=diff
+# 
+# available colours are: white, yellow, green, blue,
+#                        cyan, red, magenta, black,
+#                        darkwhite, darkyellow, darkgreen,
+#                        darkblue, darkcyan, darkred,
+#                        darkmagenta, darkblack
+#
+# Can also specify 'none', 'normal' or 'off' which are all
+# aliases for the same thing, namely "don't colour highlight
+# this, use the default output colour"
+#
+plain=off
+newtext=blue
+oldtext=red
+diffstuff=magenta
+cvsstuff=green
diff --git a/fail2ban/action.d/sendmail-common.conf b/fail2ban/action.d/sendmail-common.conf
index e282047..d4da4f2 100644
--- a/fail2ban/action.d/sendmail-common.conf
+++ b/fail2ban/action.d/sendmail-common.conf
@@ -21,3 +21,5 @@ sender = fail2ban
 # Sender display name
 #
 sendername = Fail2Ban
+
+# vim: filetype=dosini
diff --git a/fail2ban/action.d/sendmail-whois.conf b/fail2ban/action.d/sendmail-whois.conf
index e428c44..2528f7a 100644
--- a/fail2ban/action.d/sendmail-whois.conf
+++ b/fail2ban/action.d/sendmail-whois.conf
@@ -74,3 +74,5 @@ actionunban =
 #
 name = default
 
+
+# vim: filetype=dosini
diff --git a/fail2ban/action.d/sendmail.conf b/fail2ban/action.d/sendmail.conf
index 70f3832..d4c5153 100644
--- a/fail2ban/action.d/sendmail.conf
+++ b/fail2ban/action.d/sendmail.conf
@@ -72,3 +72,5 @@ actionunban =
 #
 name = default
 
+
+# vim: filetype=dosini
diff --git a/fail2ban/jail.conf b/fail2ban/jail.conf
index 89f56ca..7d99912 100644
--- a/fail2ban/jail.conf
+++ b/fail2ban/jail.conf
@@ -60,14 +60,14 @@ usedns = warn
 #
 # Destination email address used solely for the interpolations in
 # jail.{conf,local} configuration files.
-destemail = root@localhost
+destemail = frank@brehm-online.com
 
 #
 # Name of the sender for mta actions
 sendername = Fail2Ban
 
 # Email address of the sender
-sender = fail2ban@localhost
+sender = fail2ban+ns3@brehm-online.com
 
 #
 # ACTIONS
@@ -98,7 +98,7 @@ 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", sendername="%(sendername)s"]
+              %(mta)s-whois[name=%(__name__)s, dest="%(destemail)s", protocol="%(protocol)s", chain="%(chain)s", sender="%(sender)s", sendername="%(sendername)s"]
 
 # ban & send an e-mail with whois report and relevant log lines
 # to the destemail.
@@ -131,7 +131,8 @@ action = %(action_)s
 enabled  = true
 port     = ssh
 filter   = sshd
-logpath  = /var/log/auth.log
+logpath  = /var/log/syslog.d/auth.log
+action   = %(action_mw)s
 maxretry = 6
 
 [dropbear]
@@ -375,10 +376,11 @@ maxretry = 6
 
 [postfix]
 
-enabled  = false
+enabled  = true
 port     = smtp,ssmtp,submission
 filter   = postfix
-logpath  = /var/log/mail.log
+logpath  = /var/log/syslog.d/mail.log
+action   = %(action_mw)s
 
 
 [couriersmtp]
@@ -550,3 +552,5 @@ action   = iptables[name=Nagios, port=5666, protocol=tcp]
            sendmail-whois[name=Nagios, dest="%(destemail)s", sender="%(sender)s", sendername="%(sendername)s"]
 logpath  = /var/log/messages     ; nrpe.cfg may define a different log_facility
 maxretry = 1
+
+# vim: filetype=dosini
-- 
2.39.5