From f8e953a0e4a6a55762fbd0c0b96b9a3e58e28f5c Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Sat, 27 Jun 2020 22:14:36 +0200 Subject: [PATCH] Allow to specify mail from header sSMTP requires a [config flag](https://tosbourn.com/allowing-your-own-from-header-with-ssmtp/) to allow setting the header. --- home.admin/XXsendNotification.py | 5 +++-- home.admin/config.scripts/blitz.notify.sh | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/home.admin/XXsendNotification.py b/home.admin/XXsendNotification.py index 0f444f893..1f55bbe33 100644 --- a/home.admin/XXsendNotification.py +++ b/home.admin/XXsendNotification.py @@ -93,6 +93,7 @@ def mail(recipient=None, message=None, subject=None, cert=None, encrypt=False, print("send mail") print("msg: {}".format(message)) print("to: {}".format(recipient)) + print("from: {} <{}>".format(from_name, from_address)) print("subject: {}".format(subject)) print("cert: {}".format(cert)) print("encrypt: {}".format(encrypt)) @@ -103,7 +104,7 @@ def mail(recipient=None, message=None, subject=None, cert=None, encrypt=False, msg_content = [ "To: {}".format(recipient), - 'From: "{} <{}>'.format(from_name, from_address), + 'From: {} <{}>'.format(from_name, from_address), "Subject: {}".format(subject), "", "{}".format(message) @@ -118,7 +119,7 @@ def mail(recipient=None, message=None, subject=None, cert=None, encrypt=False, msg = EmailMessage() msg['Subject'] = "{}".format(subject) - msg['From'] = '"{} <{}>'.format(from_name, from_address), + msg['From'] = '{} <{}>'.format(from_name, from_address), msg['To'] = recipient msg.set_payload(message) diff --git a/home.admin/config.scripts/blitz.notify.sh b/home.admin/config.scripts/blitz.notify.sh index c5d5e09a1..63a00404e 100755 --- a/home.admin/config.scripts/blitz.notify.sh +++ b/home.admin/config.scripts/blitz.notify.sh @@ -95,6 +95,7 @@ Mailhub=${notifyMailServer} AuthUser=${notifyMailUser} AuthPass=${notifyMailPass} UseSTARTTLS=YES +FromLineOverride=YES EOF # edit raspi blitz config