Skip to content

[bitnami/discourse] Allow for DISCOURSE_SMTP_DOMAIN to be set via docker #82421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ discourse_env_vars=(
DISCOURSE_SMTP_PASSWORD
DISCOURSE_SMTP_PROTOCOL
DISCOURSE_SMTP_AUTH
DISCOURSE_SMTP_DOMAIN
DISCOURSE_SMTP_OPEN_TIMEOUT
DISCOURSE_SMTP_READ_TIMEOUT
DISCOURSE_DATABASE_HOST
Expand Down Expand Up @@ -148,6 +149,8 @@ DISCOURSE_SMTP_PROTOCOL="${DISCOURSE_SMTP_PROTOCOL:-"${SMTP_PROTOCOL:-}"}"
export DISCOURSE_SMTP_PROTOCOL="${DISCOURSE_SMTP_PROTOCOL:-}"
DISCOURSE_SMTP_AUTH="${DISCOURSE_SMTP_AUTH:-"${SMTP_AUTH:-}"}"
export DISCOURSE_SMTP_AUTH="${DISCOURSE_SMTP_AUTH:-login}"
DISCOURSE_SMTP_DOMAIN="${DISCOURSE_SMTP_DOMAIN:-"${SMTP_DOMAIN:-}"}"
export DISCOURSE_SMTP_DOMAIN="${DISCOURSE_SMTP_DOMAIN:-}"
export DISCOURSE_SMTP_OPEN_TIMEOUT="${DISCOURSE_SMTP_OPEN_TIMEOUT:-}"
export DISCOURSE_SMTP_READ_TIMEOUT="${DISCOURSE_SMTP_READ_TIMEOUT:-}"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,7 @@ 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"
discourse_conf_set "smtp_domain" "$DISCOURSE_SMTP_DOMAIN"
! 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
Expand Down
1 change: 1 addition & 0 deletions bitnami/discourse/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,7 @@ The set of default standard configuration files may be found [here](https://gith
| `DISCOURSE_SMTP_PASSWORD` | Discourse SMTP server user password. | `nil` |
| `DISCOURSE_SMTP_PROTOCOL` | Discourse SMTP server protocol to use. | `nil` |
| `DISCOURSE_SMTP_AUTH` | Discourse SMTP authentication method. Allowed values: *login*, *plain*, *cram_md5*. | `login` |
| `DISCOURSE_SMTP_DOMAIN` | Discourse SMTP domain (use if email domain is different from hostname) | `nil` |
| `DISCOURSE_SMTP_OPEN_TIMEOUT` | Discourse `smtp_open_timeout` configuration override. | `nil` |
| `DISCOURSE_SMTP_READ_TIMEOUT` | Discourse `smtp_read_timeout` configuration override. | `nil` |
| `DISCOURSE_DATABASE_HOST` | Database server host. | `$DISCOURSE_DEFAULT_DATABASE_HOST` |
Expand Down
Loading