浏览代码

[Dovecot] Revert fd49958a00cb8c98f2e81a95c4d0d46aa04ae450

andryyy 5 年之前
父节点
当前提交
1fc18284ab
共有 2 个文件被更改,包括 2 次插入5 次删除
  1. 1 4
      data/Dockerfiles/dovecot/quarantine_notify.py
  2. 1 1
      docker-compose.yml

+ 1 - 4
data/Dockerfiles/dovecot/quarantine_notify.py

@@ -97,10 +97,7 @@ def notify_rcpt(rcpt, msg_count, quarantine_acl):
       print('%s'  % (ex))
       time.sleep(3)
 
-records = query_mysql('SELECT IFNULL(user_acl.quarantine, 0) AS quarantine_acl, count(id) AS counter, rcpt, sender FROM quarantine LEFT OUTER JOIN user_acl ON user_acl.username = rcpt WHERE notified = 0 AND rcpt in (SELECT username FROM mailbox)
-# dont send notifications for blacklisted senders
-AND (SELECT prefid FROM filterconf WHERE option = "blacklist_from" AND (object = rcpt OR object = SUBSTRING(rcpt, LOCATE("@", rcpt) + 1)) AND sender REGEXP(REPLACE(value, '*', '.+'))) IS NULL
-GROUP BY rcpt')
+records = query_mysql('SELECT IFNULL(user_acl.quarantine, 0) AS quarantine_acl, count(id) AS counter, rcpt FROM quarantine LEFT OUTER JOIN user_acl ON user_acl.username = rcpt WHERE notified = 0 AND rcpt in (SELECT username FROM mailbox) GROUP BY rcpt')
 
 for record in records:
   attrs = ''

+ 1 - 1
docker-compose.yml

@@ -188,7 +188,7 @@ services:
             - sogo
 
     dovecot-mailcow:
-      image: mailcow/dovecot:1.116
+      image: mailcow/dovecot:1.117
       depends_on:
         - mysql-mailcow
       dns: