daily autocommit

diff --git a/.etckeeper b/.etckeeper
index e070667f308a954c14f26d7db5249e3b8eca651c..f30c569fcff58f301daa950fe3bf063ca2b09ff7 100755 (executable)
--- 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 (file)
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 103cc5d85296209914886fcf0f672e5f291d3a3b..6b136f46fa6ca22ac8a514cc8171f5a134a634d3 100644 (file)
--- 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 8977881679df057f70b9919731f1be16d757eaa9..d0cde72338969491425b9238ca1378fdc1ac7332 100644 (file)
--- 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 (file)
Binary files a/postfix/maps/canonical.db and b/postfix/maps/canonical.db differ

diff --git a/postfix/maps/virtual_alias_maps b/postfix/maps/virtual_alias_maps
index ee212d8bfce923cb5d61ce2270316fbbd1034bfe..6a966b9993b7fc1519fe697b51348409429ff813 100644 (file)
--- 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 (file)
Binary files a/postfix/maps/virtual_alias_maps.db and b/postfix/maps/virtual_alias_maps.db differ