From dcd6b2268e2e97684178cb40138b2bdb9f744318 Mon Sep 17 00:00:00 2001 From: andryyy Date: Thu, 31 Jan 2019 21:45:58 +0100 Subject: [PATCH] [Dovecot] Various fixes for quarantine notifications, many thanks to @DevTek314 for reporting them! --- data/Dockerfiles/dovecot/quarantine_notify.py | 6 +++--- docker-compose.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/Dockerfiles/dovecot/quarantine_notify.py b/data/Dockerfiles/dovecot/quarantine_notify.py index 906077fe..8a8afbe2 100755 --- a/data/Dockerfiles/dovecot/quarantine_notify.py +++ b/data/Dockerfiles/dovecot/quarantine_notify.py @@ -68,15 +68,15 @@ def notify_rcpt(rcpt, msg_count): count = 0 while count < 15: try: - server = smtplib.SMTP('postfix', 589, 'quarntine') + server = smtplib.SMTP('postfix', 590, 'quarntine') server.ehlo() msg = MIMEMultipart('alternative') msg['From'] = r.get('Q_SENDER') or "quarantine@localhost" msg['Subject'] = r.get('Q_SUBJ') or "Spam Quarantine Notification" msg['Date'] = formatdate(localtime = True) text = "You have %d new items" % (msg_count) - text_part = MIMEText(text, 'plain') - html_part = MIMEText(html, 'html') + text_part = MIMEText(text, 'plain', 'utf-8') + html_part = MIMEText(html, 'html', 'utf-8') msg.attach(text_part) msg.attach(html_part) msg['To'] = str(rcpt) diff --git a/docker-compose.yml b/docker-compose.yml index cc0c396a..3a72aeab 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -164,7 +164,7 @@ services: - sogo dovecot-mailcow: - image: mailcow/dovecot:1.57 + image: mailcow/dovecot:1.58 build: ./data/Dockerfiles/dovecot cap_add: - NET_BIND_SERVICE