nihilist/acme.sh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make MAIL_FROM not required

Browse Source
This commit is contained in:
Honza Hommer 2019-05-13 16:06:24 +02:00
parent d180f01b45
commit d509ef7581
No known key found for this signature in database
GPG Key ID: 5EBDE8E7E1A00ACA
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
notify/mail.sh
View File

@ -27,11 +27,14 @@ mail_send() {
fi fi
MAIL_FROM="${MAIL_FROM:-$(_readaccountconf_mutable MAIL_FROM)}" MAIL_FROM="${MAIL_FROM:-$(_readaccountconf_mutable MAIL_FROM)}"
if [ -z "$MAIL_FROM" ]; then if [ -n "$MAIL_FROM" ]; then
MAIL_FROM="$USER@$(hostname -f)" if ! _contains "$MAIL_FROM" "@"; then
_info "The MAIL_FROM is not set, so use the default value: $MAIL_FROM" _err "It seems that the MAIL_FROM=$MAIL_FROM is not a valid email address."
return 1
fi fi
_saveaccountconf_mutable MAIL_FROM "$MAIL_FROM" _saveaccountconf_mutable MAIL_FROM "$MAIL_FROM"
fi
MAIL_TO="${MAIL_TO:-$(_readaccountconf_mutable MAIL_TO)}" MAIL_TO="${MAIL_TO:-$(_readaccountconf_mutable MAIL_TO)}"
if [ -z "$MAIL_TO" ]; then if [ -z "$MAIL_TO" ]; then
@ -57,7 +60,11 @@ mail_send() {
_mail_send() { _mail_send() {
case "$_MAIL_BIN" in case "$_MAIL_BIN" in
sendmail) sendmail)
if [ -n "$MAIL_FROM" ]; then
"$_MAIL_BIN" -f "$MAIL_FROM" "$MAIL_TO" "$_MAIL_BIN" -f "$MAIL_FROM" "$MAIL_TO"
else
"$_MAIL_BIN" "$MAIL_TO"
fi
;; ;;
ssmtp) ssmtp)
"$_MAIL_BIN" "$MAIL_TO" "$_MAIL_BIN" "$MAIL_TO"
@ -70,7 +77,10 @@ _mail_send() {
_mail_body() { _mail_body() {
if [ "$_MAIL_BIN" = "sendmail" ] || [ "$_MAIL_BIN" = "ssmtp" ]; then if [ "$_MAIL_BIN" = "sendmail" ] || [ "$_MAIL_BIN" = "ssmtp" ]; then
if [ -n "$MAIL_FROM" ]; then
echo "From: $MAIL_FROM" echo "From: $MAIL_FROM"
fi
echo "To: $MAIL_TO" echo "To: $MAIL_TO"
echo "Subject: $subject" echo "Subject: $subject"
echo "Content-Type: $contenttype" echo "Content-Type: $contenttype"