From e73341eddebd56dace8328376baed3a5d76841a5 Mon Sep 17 00:00:00 2001
From: root <root@helga.brehm-online.com>
Date: Fri, 18 Mar 2016 03:10:16 +0100
Subject: [PATCH] daily autocommit

---
 .etckeeper                         |   1 +
 fail2ban/jail.d/postfix.conf       |  10 ++++++++++
 postfix/main.cf                    |   2 +-
 postfix/maps/canonical             |   1 +
 postfix/maps/canonical.db          | Bin 12288 -> 12288 bytes
 postfix/maps/virtual_alias_maps    |  14 ++++++++------
 postfix/maps/virtual_alias_maps.db | Bin 12288 -> 12288 bytes
 7 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 fail2ban/jail.d/postfix.conf

diff --git a/.etckeeper b/.etckeeper
index e070667..f30c569 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -1435,6 +1435,7 @@ maybe chmod 0644 'fail2ban/filter.d/wuftpd.conf'
 maybe chmod 0644 'fail2ban/filter.d/xinetd-fail.conf'
 maybe chmod 0644 'fail2ban/jail.conf'
 maybe chmod 0755 'fail2ban/jail.d'
+maybe chmod 0644 'fail2ban/jail.d/postfix.conf'
 maybe chmod 0644 'fail2ban/jail.d/smtp.conf'
 maybe chmod 0644 'fail2ban/jail.d/sshd.conf'
 maybe chmod 0644 'fail2ban/paths-common.conf'
diff --git a/fail2ban/jail.d/postfix.conf b/fail2ban/jail.d/postfix.conf
new file mode 100644
index 0000000..0468489
--- /dev/null
+++ b/fail2ban/jail.d/postfix.conf
@@ -0,0 +1,10 @@
+[postfix]
+
+enabled  = true
+port     = smtp,ssmtp,submission
+filter   = postfix
+logpath  = /var/log/syslog.d/mail.log
+action   = %(action_mw)s
+
+
+# vim: filetype=dosini
diff --git a/postfix/main.cf b/postfix/main.cf
index 103cc5d..6b136f4 100644
--- a/postfix/main.cf
+++ b/postfix/main.cf
@@ -701,7 +701,7 @@ message_size_limit = 51200000
 mydestination = $myhostname, $mydomain, hash:/etc/postfix/maps/mydomains
 mydomain = brehm-online.com
 myhostname = helga.brehm-online.com
-mynetworks = 127.0.0.0/8 85.214.134.152/32 85.214.109.1/32 [::1]/128 [2a01:238:4225:6e00:8f8c:808a:7fb8:88df]/128
+mynetworks = 127.0.0.0/8 85.214.134.152/32 [::1]/128 [2a01:238:4225:6e00:8f8c:808a:7fb8:88df]/128 138.201.28.135/32 [2a01:4f8:171:3006::2]/128
 mynetworks_style = host
 myorigin = $mydomain
 #recipient_bcc_maps = mysql:/etc/postfix/mysql-recipient_bcc.cf
diff --git a/postfix/maps/canonical b/postfix/maps/canonical
index 8977881..d0cde72 100644
--- a/postfix/maps/canonical
+++ b/postfix/maps/canonical
@@ -9,3 +9,4 @@
 # Zum Ändern bitte MySQL-Tabelle 'canonical' in der Datenbank 'vmail' auf localhost editieren.
 #
 
+root@liz.uhu-banane.de		root+liz@uhu-banane.de
diff --git a/postfix/maps/canonical.db b/postfix/maps/canonical.db
index ea9bdbd02f81b18d9a3f07ddf64ba517ca71bb23..75241c2245f434fdb3c65e7bafc2e4a401f98d6e 100644
GIT binary patch
delta 150
zcmZojXh@h~q8eb%%fQ6Rz|g>FRevdz0Sp*{BnZO*<HpF<{8H$mObi$J8F*jtU*O+Z
zxQSn%u_!;kL^~(5%Aqu)R5vLxFEKAwFC~=$Ebagl*FzDX{9oRb57qLGPW$))w~iy|

delta 66
zcmZojXh@h~!uLUmfq|Kmfnld-Se=p4<bV8Pn<Erf@NYH{SinEAA!Ra)f&nfy0J0Ah
Ae*gdg

diff --git a/postfix/maps/virtual_alias_maps b/postfix/maps/virtual_alias_maps
index ee212d8..6a966b9 100644
--- a/postfix/maps/virtual_alias_maps
+++ b/postfix/maps/virtual_alias_maps
@@ -9,10 +9,12 @@
 # Zum Ändern bitte MySQL-Tabelle 'virtual' in der Datenbank 'vmail' auf localhost editieren.
 #
 
-alfred-1980@uhu-banane.net   frank
-me@uhu-banane.de	     frank
-alfred@uhu-banane.net        frank, frank.brehm.61@googlemail.com
-frak@brehm-online.com        frank@brehm-online.com
-nacho.libre@uhu-banane.de    noreply
-tabaluga@uhu-banane.net      frank
+alfred-1980@uhu-banane.net	frank
+me@uhu-banane.de		frank
+alfred@uhu-banane.net		frank, frank.brehm.61@googlemail.com
+frak@brehm-online.com		frank@brehm-online.com
+nacho.libre@uhu-banane.de	noreply
+tabaluga@uhu-banane.net		frank
+#liz@uhu-banane.de		frank, schmidt@acwain.com, tomsyhh@googlemail.com
+liz@uhu-banane.de		frank
 
diff --git a/postfix/maps/virtual_alias_maps.db b/postfix/maps/virtual_alias_maps.db
index 684dc6be229a13cf15d37b63b6a6078cee455e89..5fb8827e5d1eacb5ae3ed54efd1f562315676ff5 100644
GIT binary patch
delta 78
zcmZojXh@h~!=@82+0YX@`5(U+Bm2h4-TY!44E6jByifS=@}J^A%)f$vK7Sj3J^#kS
aQ2xm?<$aiQGOH$^lg~raw>d&#1wQ~1A{zAo

delta 70
zcmZojXh@h~!*;$}^H@0Z<bV8PjBFbtck>IeG0fy=;C;e>m;Vs|PW}b_Gx;|b7V}T8
Sm-m_cR6ZO@{pJXT75o5zMH!O-

-- 
2.39.5