HOST is deprecated, use SMTP_ADDR and SMTP_PORT (#51275)

* HOST is deprecated, use SMTP_ADDR and SMTP_PORT

Signed-off-by: Ronan LE MEILLAT <rtkgps@outlook.com>

* Update bitnami/gitea/1/debian-11/rootfs/opt/bitnami/scripts/libgitea.sh

Co-authored-by: Fran de Paz Galán <fdepaz@vmware.com>
Signed-off-by: Ronan LE MEILLAT <eltorio@users.noreply.github.com>

---------

Signed-off-by: Ronan LE MEILLAT <rtkgps@outlook.com>
Signed-off-by: Ronan LE MEILLAT <eltorio@users.noreply.github.com>
Co-authored-by: Ronan LE MEILLAT <rtkgps@outlook.com>
Co-authored-by: Fran de Paz Galán <fdepaz@vmware.com>
This commit is contained in:
Ronan LE MEILLAT
2023-11-06 18:01:06 +01:00
committed by GitHub
parent dae1c2ef8f
commit 0364da1b7b
2 changed files with 5 additions and 2 deletions

View File

@@ -116,6 +116,7 @@ export GITEA_DATABASE_SCHEMA="${GITEA_DATABASE_SCHEMA:-}"
export GITEA_DATABASE_CHARSET="${GITEA_DATABASE_CHARSET:-utf8}"
export GITEA_SMTP_ENABLED="${GITEA_SMTP_ENABLED:-false}"
export GITEA_SMTP_HOST="${GITEA_SMTP_HOST:-}"
export GITEA_SMTP_PORT="${GITEA_SMTP_PORT:-25}"
export GITEA_SMTP_FROM="${GITEA_SMTP_FROM:-}"
export GITEA_SMTP_USER="${GITEA_SMTP_USER:-}"
export GITEA_SMTP_PASSWORD="${GITEA_SMTP_PASSWORD:-}"

View File

@@ -212,7 +212,8 @@ gitea_update_conf_file() {
gitea_conf_set "security" "PASSWORD_HASH_ALGO" "$GITEA_PASSWORD_HASH_ALGO"
gitea_conf_set "mailer" "ENABLED" "$GITEA_SMTP_ENABLED"
is_empty_value "$GITEA_SMTP_HOST" || gitea_conf_set "mailer" "HOST" "$GITEA_SMTP_HOST"
is_empty_value "$GITEA_SMTP_HOST" || gitea_conf_set "mailer" "SMTP_ADDR" "$GITEA_SMTP_HOST"
is_empty_value "$GITEA_SMTP_PORT" || gitea_conf_set "mailer" "SMTP_PORT" "$GITEA_SMTP_PORT"
is_empty_value "$GITEA_SMTP_FROM" || gitea_conf_set "mailer" "FROM" "$GITEA_SMTP_FROM"
is_empty_value "$GITEA_SMTP_USER" || gitea_conf_set "mailer" "USER" "$GITEA_SMTP_USER"
is_empty_value "$GITEA_SMTP_PASSWORD" || gitea_conf_set "mailer" "PASSWD" "$GITEA_SMTP_PASSWORD"
@@ -295,7 +296,8 @@ gitea_pass_wizard() {
# Note in version 1.18 SMTP configuration is different
if is_boolean_yes "${GITEA_SMTP_ENABLED}"; then
curl_data_opts+=(
"--data-urlencode" "smtp_host=${GITEA_SMTP_HOST}"
"--data-urlencode" "smtp_addr=${GITEA_SMTP_HOST}"
"--data-urlencode" "smtp_port=${GITEA_SMTP_PORT}"
"--data-urlencode" "smtp_from=${GITEA_SMTP_FROM}"
"--data-urlencode" "smtp_user=${GITEA_SMTP_USER}"
"--data-urlencode" "smtp_passwd=${GITEA_SMTP_PASSWORD}"