Disroot
/
gpg-lacre
9
15
Fork 4
Code Issues 29 Pull Requests 1 Releases 2 Wiki Activity

Fix minor cron.py issues #64

Merged
pfm merged 13 commits from fix-cron-script into master 2022-05-06 19:25:13 +02:00
Conversation 2 Commits 13 Files Changed 7 +3 -3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 52b31028c5 - Show all commits

6
gpg-mailgate-web/cron.py
View File

@ -55,7 +55,7 @@ def authenticate_maybe(smtp):
if 'smtp' in cfg and 'enabled' in cfg['smtp'] and cfg['smtp']['enabled'] == 'true':
smtp.connect(cfg['smtp']['host'],cfg['smtp']['port'])
smtp.ehlo()
if cfg['smtp']['startls'] == 'true':
if 'starttls' in cfg['smtp'] and cfg['smtp']['starttls'] == 'true':
smtp.starttls()
smtp.ehlo()
smtp.login(cfg['smtp']['username'], cfg['smtp']['password'])
@ -67,10 +67,10 @@ def send_msg( mailsubject, messagefile, recipients = None ):
msg["From"] = cfg['cron']['notification_email']
msg["To"] = recipients
msg["Subject"] = mailsubject
msg.attach(MIMEText(mailbody, 'plain'))
msg.attach(MIMEText(markdown.markdown(mailbody), 'html'))
if 'relay' in cfg and 'host' in cfg['relay'] and 'enc_port' in cfg['relay']:
relay = (cfg['relay']['host'], int(cfg['relay']['enc_port']))
smtp = smtplib.SMTP(relay[0], relay[1])