From dc671a2c6d443bce0b236ed88542f7fda24c3c61 Mon Sep 17 00:00:00 2001 From: Dan Behrman Date: Tue, 16 May 2023 09:41:46 -0500 Subject: [PATCH] [bitnami/discourse] Added timeout env configuration (#33316) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Added timeout env configuration Signed-off-by: dab * Update bitnami/discourse/3/debian-11/rootfs/opt/bitnami/scripts/libdiscourse.sh Co-authored-by: Juan José Martos Signed-off-by: Dan Behrman --------- Signed-off-by: dab Signed-off-by: Dan Behrman Co-authored-by: Juan José Martos --- .../3/debian-11/rootfs/opt/bitnami/scripts/discourse-env.sh | 2 ++ .../3/debian-11/rootfs/opt/bitnami/scripts/libdiscourse.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/bitnami/discourse/3/debian-11/rootfs/opt/bitnami/scripts/discourse-env.sh b/bitnami/discourse/3/debian-11/rootfs/opt/bitnami/scripts/discourse-env.sh index 7cc9f027327b..8a6d5a564e09 100644 --- a/bitnami/discourse/3/debian-11/rootfs/opt/bitnami/scripts/discourse-env.sh +++ b/bitnami/discourse/3/debian-11/rootfs/opt/bitnami/scripts/discourse-env.sh @@ -47,6 +47,8 @@ discourse_env_vars=( DISCOURSE_SMTP_PASSWORD DISCOURSE_SMTP_PROTOCOL DISCOURSE_SMTP_AUTH + DISCOURSE_SMTP_OPEN_TIMEOUT + DISCOURSE_SMTP_READ_TIMEOUT DISCOURSE_DATABASE_HOST DISCOURSE_DATABASE_PORT_NUMBER DISCOURSE_DATABASE_NAME diff --git a/bitnami/discourse/3/debian-11/rootfs/opt/bitnami/scripts/libdiscourse.sh b/bitnami/discourse/3/debian-11/rootfs/opt/bitnami/scripts/libdiscourse.sh index ea2a984fdf3d..aa27f2e657fe 100644 --- a/bitnami/discourse/3/debian-11/rootfs/opt/bitnami/scripts/libdiscourse.sh +++ b/bitnami/discourse/3/debian-11/rootfs/opt/bitnami/scripts/libdiscourse.sh @@ -267,6 +267,8 @@ discourse_create_conf_file() { discourse_conf_set "smtp_password" "$DISCOURSE_SMTP_PASSWORD" discourse_conf_set "smtp_enable_start_tls" "$([[ "$DISCOURSE_SMTP_PROTOCOL" = "tls" ]] && echo "true" || echo "false")" discourse_conf_set "smtp_authentication" "$DISCOURSE_SMTP_AUTH" + ! is_empty_value "$DISCOURSE_SMTP_OPEN_TIMEOUT" && discourse_conf_set "smtp_open_timeout" "$DISCOURSE_SMTP_OPEN_TIMEOUT" + ! is_empty_value "$DISCOURSE_SMTP_READ_TIMEOUT" && discourse_conf_set "smtp_read_timeout" "$DISCOURSE_SMTP_READ_TIMEOUT" fi # Extra configuration ! is_empty_value "$DISCOURSE_EXTRA_CONF_CONTENT" && echo "$DISCOURSE_EXTRA_CONF_CONTENT" >> "$DISCOURSE_CONF_FILE"