From bdf76327579a996dab2594bb1b3936e94c3abd49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9?= <andre.peters@servercow.de>
Date: Thu, 2 Aug 2018 12:15:04 +0200
Subject: [PATCH] [Postfix] Add '*' as send_as to sender_acl map [Postfix]
 Syslog-ng: Do not trim after each push to Redis

---
 data/Dockerfiles/postfix/postfix.sh     | 1 +
 data/Dockerfiles/postfix/syslog-ng.conf | 9 ---------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/data/Dockerfiles/postfix/postfix.sh b/data/Dockerfiles/postfix/postfix.sh
index 2d9671c0..28e51ccd 100755
--- a/data/Dockerfiles/postfix/postfix.sh
+++ b/data/Dockerfiles/postfix/postfix.sh
@@ -210,6 +210,7 @@ query = SELECT goto FROM alias
   SELECT logged_in_as FROM sender_acl
     WHERE send_as='@%d'
       OR send_as='%s'
+      OR send_as='*'
       OR send_as IN (
         SELECT CONCAT('@',target_domain) FROM alias_domain
           WHERE alias_domain = '%d')
diff --git a/data/Dockerfiles/postfix/syslog-ng.conf b/data/Dockerfiles/postfix/syslog-ng.conf
index ef835891..5d11a3b7 100644
--- a/data/Dockerfiles/postfix/syslog-ng.conf
+++ b/data/Dockerfiles/postfix/syslog-ng.conf
@@ -30,14 +30,6 @@ destination d_redis_f2b_channel {
     command("PUBLISH" "F2B_CHANNEL" "$MESSAGE")
   );
 };
-destination d_redis_cleanup {
-  redis(
-    host("redis-mailcow")
-    persist-name("redis3")
-    port(6379)
-    command("LTRIM" "POSTFIX_MAILLOG" "0" "`LOG_LINES`")
-  );
-};
 filter f_mail { facility(mail); };
 filter f_skip_local { not facility (local0, local1, local2, local3, local4, local5, local6, local7); };
 log {
@@ -47,5 +39,4 @@ log {
   filter(f_mail);
   destination(d_redis_ui_log);
   destination(d_redis_f2b_channel);
-  destination(d_redis_cleanup);
 };