From f550222f7afd7b20efc7464d1a58150bd031cf87 Mon Sep 17 00:00:00 2001 From: Martin Balvers Date: Tue, 26 Mar 2024 11:28:23 +0100 Subject: [PATCH] fix: no deed to change README.md and env-defaults --- README.md | 2 +- assets/runtime/env-defaults | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 1629ed84..7bba8d7f 100644 --- a/README.md +++ b/README.md @@ -660,7 +660,7 @@ Below is the complete list of parameters that can be set using environment varia - **SMTP_OPENSSL_VERIFY_MODE**: SMTP openssl verification mode. Accepted values are `none`, `peer`, `client_once` and `fail_if_no_peer_cert`. SSL certificate verification is performed by default. - **SMTP_STARTTLS**: Enable STARTTLS. Defaults to `true`. - **SMTP_TLS**: Enable SSL/TLS. Defaults to `false`. -- **SMTP_SSL**: Enable SSL. Defaults to not set. +- **SMTP_SSL**: Enable SSL. Defaults to `false`. https://www.redmine.org/projects/redmine/wiki/EmailConfiguration#Error-TimeoutError-due-to-SSL-SMTP-server-connection - **SMTP_AUTHENTICATION**: Specify the SMTP authentication method. Defaults to `:login` if `SMTP_USER` is set. - **SMTP_CA_ENABLED**: Enable custom CA certificates for SMTP email configuration. Defaults to `false`. diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 5f0551e4..10231476 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -96,6 +96,7 @@ SMTP_PASS=${SMTP_PASS:-} SMTP_OPENSSL_VERIFY_MODE=${SMTP_OPENSSL_VERIFY_MODE:-} SMTP_STARTTLS=${SMTP_STARTTLS:-true} SMTP_TLS=${SMTP_TLS:-false} +SMTP_SSL=${SMTP_SSL:-false} SMTP_CA_ENABLED=${SMTP_CA_ENABLED:-false} SMTP_CA_PATH=${SMTP_CA_PATH:-$REDMINE_DATA_DIR/certs} SMTP_CA_FILE=${SMTP_CA_FILE:-$REDMINE_DATA_DIR/certs/ca.crt}