fix: fix Mail Test error

This commit is contained in:
ttionya
2021-12-31 01:08:00 +08:00
parent 13ac83dcc6
commit d20228ef38
2 changed files with 35 additions and 31 deletions
+3 -2
View File
@@ -11,6 +11,9 @@ fi
# mailx test
if [[ "$1" == "mail" ]]; then
export_env_file
init_env_mail
MAIL_SMTP_ENABLE="TRUE"
MAIL_DEBUG="TRUE"
@@ -18,8 +21,6 @@ if [[ "$1" == "mail" ]]; then
MAIL_TO="$2"
fi
init_env
send_mail "vaultwarden Backup Test" "Your SMTP looks configured correctly."
exit 0
+32 -29
View File
@@ -190,6 +190,7 @@ function init_env() {
export_env_file
init_env_dir
init_env_mail
# CRON
get_env CRON
@@ -240,35 +241,6 @@ function init_env() {
get_env PING_URL
PING_URL="${PING_URL:-""}"
# MAIL_SMTP_ENABLE
# MAIL_TO
get_env MAIL_SMTP_ENABLE
get_env MAIL_TO
MAIL_SMTP_ENABLE=$(echo "${MAIL_SMTP_ENABLE}" | tr '[a-z]' '[A-Z]')
if [[ "${MAIL_SMTP_ENABLE}" == "TRUE" && "${MAIL_TO}" ]]; then
MAIL_SMTP_ENABLE="TRUE"
else
MAIL_SMTP_ENABLE="FALSE"
fi
# MAIL_WHEN_SUCCESS
get_env MAIL_WHEN_SUCCESS
MAIL_WHEN_SUCCESS=$(echo "${MAIL_WHEN_SUCCESS}" | tr '[a-z]' '[A-Z]')
if [[ "${MAIL_WHEN_SUCCESS}" == "FALSE" ]]; then
MAIL_WHEN_SUCCESS="FALSE"
else
MAIL_WHEN_SUCCESS="TRUE"
fi
# MAIL_WHEN_FAILURE
get_env MAIL_WHEN_FAILURE
MAIL_WHEN_FAILURE=$(echo "${MAIL_WHEN_FAILURE}" | tr '[a-z]' '[A-Z]')
if [[ "${MAIL_WHEN_FAILURE}" == "FALSE" ]]; then
MAIL_WHEN_FAILURE="FALSE"
else
MAIL_WHEN_FAILURE="TRUE"
fi
# TIMEZONE
get_env TIMEZONE
local TIMEZONE_MATCHED_COUNT=$(ls "/usr/share/zoneinfo/${TIMEZONE}" 2> /dev/null | wc -l)
@@ -337,3 +309,34 @@ function init_env_dir() {
DATA_SENDS_DIRNAME="$(dirname "${DATA_SENDS}")"
DATA_SENDS_BASENAME="$(basename "${DATA_SENDS}")"
}
function init_env_mail() {
# MAIL_SMTP_ENABLE
# MAIL_TO
get_env MAIL_SMTP_ENABLE
get_env MAIL_TO
MAIL_SMTP_ENABLE=$(echo "${MAIL_SMTP_ENABLE}" | tr '[a-z]' '[A-Z]')
if [[ "${MAIL_SMTP_ENABLE}" == "TRUE" && "${MAIL_TO}" ]]; then
MAIL_SMTP_ENABLE="TRUE"
else
MAIL_SMTP_ENABLE="FALSE"
fi
# MAIL_WHEN_SUCCESS
get_env MAIL_WHEN_SUCCESS
MAIL_WHEN_SUCCESS=$(echo "${MAIL_WHEN_SUCCESS}" | tr '[a-z]' '[A-Z]')
if [[ "${MAIL_WHEN_SUCCESS}" == "FALSE" ]]; then
MAIL_WHEN_SUCCESS="FALSE"
else
MAIL_WHEN_SUCCESS="TRUE"
fi
# MAIL_WHEN_FAILURE
get_env MAIL_WHEN_FAILURE
MAIL_WHEN_FAILURE=$(echo "${MAIL_WHEN_FAILURE}" | tr '[a-z]' '[A-Z]')
if [[ "${MAIL_WHEN_FAILURE}" == "FALSE" ]]; then
MAIL_WHEN_FAILURE="FALSE"
else
MAIL_WHEN_FAILURE="TRUE"
fi
}