plantroon/acme.sh
1
0
Fork 0
mirror of https://github.com/plantroon/acme.sh.git synced 2024-12-25 14:41:40 +00:00
Code Issues Projects Releases Wiki Activity

Use PROJECT_NAME and VER for X-Mailer header

Browse Source 
Also add X-Mailer header to Python version
This commit is contained in:
medmunds 2021-02-15 12:23:48 -08:00
parent ffe7ef4764
commit 6ff75f9a9f
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
notify/smtp.sh
View File

@ -112,6 +112,7 @@ smtp_send() {
_SMTP_USERNAME="$SMTP_USERNAME" _SMTP_USERNAME="$SMTP_USERNAME"
_SMTP_PASSWORD="$SMTP_PASSWORD" _SMTP_PASSWORD="$SMTP_PASSWORD"
_SMTP_TIMEOUT="${SMTP_TIMEOUT:-30}" _SMTP_TIMEOUT="${SMTP_TIMEOUT:-30}"
_SMTP_X_MAILER="${PROJECT_NAME} ${VER} --notify-hook smtp"
# Run with --debug 2 (or above) to echo the transcript of the SMTP session. # Run with --debug 2 (or above) to echo the transcript of the SMTP session.
# Careful: this may include SMTP_PASSWORD in plaintext! # Careful: this may include SMTP_PASSWORD in plaintext!
@ -232,7 +233,7 @@ _smtp_raw_message() {
echo "Date: $(date +'%a, %-d %b %Y %H:%M:%S %z')" echo "Date: $(date +'%a, %-d %b %Y %H:%M:%S %z')"
fi fi
echo "Content-Type: text/plain; charset=utf-8" echo "Content-Type: text/plain; charset=utf-8"
echo "X-Mailer: acme.sh --notify-hook smtp" echo "X-Mailer: $_SMTP_X_MAILER"
echo echo
echo "$_SMTP_CONTENT" echo "$_SMTP_CONTENT"
} }
@ -286,6 +287,7 @@ smtp_secure = """$_SMTP_SECURE"""
username = """$_SMTP_USERNAME""" username = """$_SMTP_USERNAME"""
password = """$_SMTP_PASSWORD""" password = """$_SMTP_PASSWORD"""
timeout=int("""$_SMTP_TIMEOUT""") # seconds timeout=int("""$_SMTP_TIMEOUT""") # seconds
x_mailer="""$_SMTP_X_MAILER"""
from_email="""$_SMTP_FROM""" from_email="""$_SMTP_FROM"""
to_emails="""$_SMTP_TO""" # can be comma-separated to_emails="""$_SMTP_TO""" # can be comma-separated
@ -301,6 +303,7 @@ except (AttributeError, TypeError):
msg["Subject"] = subject msg["Subject"] = subject
msg["From"] = from_email msg["From"] = from_email
msg["To"] = to_emails msg["To"] = to_emails
msg["X-Mailer"] = x_mailer
smtp = None smtp = None
try: try: