diff --git a/bitnami/discourse/2/debian-11/rootfs/opt/bitnami/scripts/discourse-env.sh b/bitnami/discourse/2/debian-11/rootfs/opt/bitnami/scripts/discourse-env.sh index 25d71e6bc9da..9c1d87d46776 100644 --- a/bitnami/discourse/2/debian-11/rootfs/opt/bitnami/scripts/discourse-env.sh +++ b/bitnami/discourse/2/debian-11/rootfs/opt/bitnami/scripts/discourse-env.sh @@ -55,6 +55,7 @@ discourse_env_vars=( DISCOURSE_REDIS_HOST DISCOURSE_REDIS_PORT_NUMBER DISCOURSE_REDIS_PASSWORD + DISCOURSE_REDIS_USE_SSL DISCOURSE_HOSTNAME DISCOURSE_SKIP_INSTALL SMTP_HOST @@ -72,6 +73,7 @@ discourse_env_vars=( REDIS_HOST REDIS_PORT_NUMBER REDIS_PASSWORD + REDIS_USE_SSL ) for env_var in "${discourse_env_vars[@]}"; do file_env_var="${env_var}_FILE" @@ -159,5 +161,7 @@ DISCOURSE_REDIS_PORT_NUMBER="${DISCOURSE_REDIS_PORT_NUMBER:-"${REDIS_PORT_NUMBER export DISCOURSE_REDIS_PORT_NUMBER="${DISCOURSE_REDIS_PORT_NUMBER:-6379}" DISCOURSE_REDIS_PASSWORD="${DISCOURSE_REDIS_PASSWORD:-"${REDIS_PASSWORD:-}"}" export DISCOURSE_REDIS_PASSWORD="${DISCOURSE_REDIS_PASSWORD:-}" +DISCOURSE_REDIS_USE_SSL="${DISCOURSE_REDIS_USE_SSL:-"${REDIS_USE_SSL:-}"}" +export DISCOURSE_REDIS_USE_SSL="${DISCOURSE_REDIS_USE_SSL:-no}" # Custom environment variables may be defined below diff --git a/bitnami/discourse/2/debian-11/rootfs/opt/bitnami/scripts/libdiscourse.sh b/bitnami/discourse/2/debian-11/rootfs/opt/bitnami/scripts/libdiscourse.sh index 7d29545f5a5d..9e12dee8a368 100644 --- a/bitnami/discourse/2/debian-11/rootfs/opt/bitnami/scripts/libdiscourse.sh +++ b/bitnami/discourse/2/debian-11/rootfs/opt/bitnami/scripts/libdiscourse.sh @@ -88,6 +88,7 @@ discourse_validate() { ! is_empty_value "$DISCOURSE_DATABASE_PORT_NUMBER" && check_valid_port "DISCOURSE_DATABASE_PORT_NUMBER" ! is_empty_value "$DISCOURSE_REDIS_HOST" && check_resolved_hostname "$DISCOURSE_REDIS_HOST" ! is_empty_value "$DISCOURSE_REDIS_PORT_NUMBER" && check_valid_port "DISCOURSE_REDIS_PORT_NUMBER" + ! is_empty_value "$DISCOURSE_REDIS_USE_SSL" && check_yes_no_value "$DISCOURSE_REDIS_USE_SSL" if ! is_file_writable "$DISCOURSE_CONF_FILE"; then warn "The Discourse configuration file ${DISCOURSE_CONF_FILE} is not writable. Configurations specified via environment variables will not be applied to this file." is_boolean_yes "$DISCOURSE_ENABLE_CONF_PERSISTENCE" && warn "The DISCOURSE_ENABLE_CONF_PERSISTENCE configuration is enabled but the ${DISCOURSE_CONF_FILE} file is not writable. The file will not be persisted." @@ -249,6 +250,7 @@ discourse_create_conf_file() { discourse_conf_set "redis_host" "$DISCOURSE_REDIS_HOST" discourse_conf_set "redis_port" "$DISCOURSE_REDIS_PORT_NUMBER" discourse_conf_set "redis_password" "$DISCOURSE_REDIS_PASSWORD" + is_boolean_yes "$DISCOURSE_REDIS_USE_SSL" && discourse_conf_set "redis_use_ssl" true # SMTP credentials if ! is_empty_value "$DISCOURSE_SMTP_HOST"; then info "Enabling SMTP" diff --git a/bitnami/discourse/README.md b/bitnami/discourse/README.md index bf59e5895228..c6e11c96c552 100644 --- a/bitnami/discourse/README.md +++ b/bitnami/discourse/README.md @@ -317,6 +317,7 @@ Available environment variables: - `DISCOURSE_REDIS_HOST`: Hostname for Redis(R). Default: **redis** - `DISCOURSE_REDIS_PORT_NUMBER`: Port used by Redis(R). Default: **6379** - `DISCOURSE_REDIS_PASSWORD`: Password for Redis(R). +- `DISCOURSE_REDIS_USE_SSL`: Whether to enable SSL for Redis(R). Default: **no** ##### Create a database for Discourse using postgresql-client