paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Dovecot] Various fixes for quarantine notifications, many thanks to @DevTek314 for reporting them!

master
andryyy 2019-01-31 21:45:58 +01:00
parent 3aef412669
commit dcd6b2268e
No known key found for this signature in database
GPG Key ID: 8EC34FF2794E25EF
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/Dockerfiles/dovecot/quarantine_notify.py
View File

@ -68,15 +68,15 @@ def notify_rcpt(rcpt, msg_count):
count = 0 count = 0
while count < 15: while count < 15:
try: try:
server = smtplib.SMTP('postfix', 589, 'quarntine') server = smtplib.SMTP('postfix', 590, 'quarntine')
server.ehlo() server.ehlo()
msg = MIMEMultipart('alternative') msg = MIMEMultipart('alternative')
msg['From'] = r.get('Q_SENDER') or "quarantine@localhost" msg['From'] = r.get('Q_SENDER') or "quarantine@localhost"
msg['Subject'] = r.get('Q_SUBJ') or "Spam Quarantine Notification" msg['Subject'] = r.get('Q_SUBJ') or "Spam Quarantine Notification"
msg['Date'] = formatdate(localtime = True) msg['Date'] = formatdate(localtime = True)
text = "You have %d new items" % (msg_count) text = "You have %d new items" % (msg_count)
text_part = MIMEText(text, 'plain') text_part = MIMEText(text, 'plain', 'utf-8')
html_part = MIMEText(html, 'html') html_part = MIMEText(html, 'html', 'utf-8')
msg.attach(text_part) msg.attach(text_part)
msg.attach(html_part) msg.attach(html_part)
msg['To'] = str(rcpt) msg['To'] = str(rcpt)

2
docker-compose.yml
View File

@ -164,7 +164,7 @@ services:
- sogo - sogo
dovecot-mailcow: dovecot-mailcow:
image: mailcow/dovecot:1.57 image: mailcow/dovecot:1.58
build: ./data/Dockerfiles/dovecot build: ./data/Dockerfiles/dovecot
cap_add: cap_add:
- NET_BIND_SERVICE - NET_BIND_SERVICE