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

[Dovecot] Once again... finally fixed?

master
andryyy 2019-01-31 22:18:32 +01:00
parent 7e5fc0f763
commit 3bfd2c8885
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

@ -59,8 +59,8 @@ def notify_rcpt(rcpt, msg_count):
template = Template(r.get('Q_HTML')) template = Template(r.get('Q_HTML'))
except: except:
print "Error: Cannot parse quarantine template, falling back to default template." print "Error: Cannot parse quarantine template, falling back to default template."
with open('/templates/quarantine.tpl') as file_: with open('/templates/quarantine.tpl') as file_:
template = Template(file_.read()) template = Template(file_.read())
else: else:
with open('/templates/quarantine.tpl') as file_: with open('/templates/quarantine.tpl') as file_:
template = Template(file_.read()) template = Template(file_.read())
@ -68,7 +68,7 @@ def notify_rcpt(rcpt, msg_count):
count = 0 count = 0
while count < 15: while count < 15:
try: try:
server = smtplib.SMTP('postfix', 590, 'quarntine') server = smtplib.SMTP('postfix', 590, 'quarantine')
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"

2
docker-compose.yml
View File

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