From 17fefc42af054f823af3c0535edb670164ce807e Mon Sep 17 00:00:00 2001
From: Thiago Navarro <navarro.ime@gmail.com>
Date: Mon, 27 Feb 2023 07:42:47 -0300
Subject: [PATCH] [bitnami/redmine] adds ca_file and openssl_verify_mode for
 smtp config (#25395)

[bitnami/redmine] adds ca_file and openssl_verify_mode for smtp configuration

Signed-off-by: Thiago Navarro <navarro.ime@gmail.com>
---
 .../5/debian-11/rootfs/opt/bitnami/scripts/libredmine.sh   | 2 ++
 .../5/debian-11/rootfs/opt/bitnami/scripts/redmine-env.sh  | 7 +++++++
 bitnami/redmine/README.md                                  | 2 ++
 3 files changed, 11 insertions(+)

diff --git a/bitnami/redmine/5/debian-11/rootfs/opt/bitnami/scripts/libredmine.sh b/bitnami/redmine/5/debian-11/rootfs/opt/bitnami/scripts/libredmine.sh
index 0531da87f521..3917645b6970 100644
--- a/bitnami/redmine/5/debian-11/rootfs/opt/bitnami/scripts/libredmine.sh
+++ b/bitnami/redmine/5/debian-11/rootfs/opt/bitnami/scripts/libredmine.sh
@@ -171,6 +171,8 @@ redmine_initialize() {
             redmine_conf_set "default.email_delivery.smtp_settings.password" "$REDMINE_SMTP_PASSWORD"
             # Remove 'USER@' part from e-mail address and use as domain
             redmine_conf_set "default.email_delivery.smtp_settings.domain" "${REDMINE_SMTP_USER//*@/}"
+            redmine_conf_set "default.email_delivery.smtp_settings.openssl_verify_mode" "$REDMINE_SMTP_OPENSSL_VERIFY_MODE"
+            redmine_conf_set "default.email_delivery.smtp_settings.ca_file" "$REDMINE_SMTP_CA_FILE"
             if [[ "$REDMINE_SMTP_PROTOCOL" = "tls" ]]; then
                 redmine_conf_set "default.email_delivery.smtp_settings.enable_starttls_auto" "true" "bool"
             else
diff --git a/bitnami/redmine/5/debian-11/rootfs/opt/bitnami/scripts/redmine-env.sh b/bitnami/redmine/5/debian-11/rootfs/opt/bitnami/scripts/redmine-env.sh
index 39f9629b8182..17d956e0790b 100644
--- a/bitnami/redmine/5/debian-11/rootfs/opt/bitnami/scripts/redmine-env.sh
+++ b/bitnami/redmine/5/debian-11/rootfs/opt/bitnami/scripts/redmine-env.sh
@@ -40,6 +40,8 @@ redmine_env_vars=(
     REDMINE_SMTP_PASSWORD
     REDMINE_SMTP_PROTOCOL
     REDMINE_SMTP_AUTH
+    REDMINE_SMTP_OPENSSL_VERIFY_MODE
+    REDMINE_SMTP_CA_FILE
     REDMINE_DATABASE_TYPE
     REDMINE_DATABASE_HOST
     REDMINE_DATABASE_PORT_NUMBER
@@ -119,6 +121,11 @@ REDMINE_SMTP_PROTOCOL="${REDMINE_SMTP_PROTOCOL:-"${SMTP_PROTOCOL:-}"}"
 export REDMINE_SMTP_PROTOCOL="${REDMINE_SMTP_PROTOCOL:-}" # only used during the first initialization
 REDMINE_SMTP_AUTH="${REDMINE_SMTP_AUTH:-"${SMTP_AUTHENTICATION:-}"}"
 export REDMINE_SMTP_AUTH="${REDMINE_SMTP_AUTH:-login}" # only used during the first initialization
+REDMINE_SMTP_OPENSSL_VERIFY_MODE="${REDMINE_SMTP_OPENSSL_VERIFY_MODE:-"${SMTP_OPENSSL_VERIFY_MODE:-}"}"
+export REDMINE_SMTP_OPENSSL_VERIFY_MODE="${REDMINE_SMTP_OPENSSL_VERIFY_MODE:-peer}" # only used during the first initialization
+REDMINE_SMTP_CA_FILE="${REDMINE_SMTP_CA_FILE:-"${SMTP_CA_FILE:-}"}"
+export REDMINE_SMTP_CA_FILE="${REDMINE_SMTP_CA_FILE:-/etc/ssl/certs/ca-certificates.crt}" # only used during the first initialization
+
 
 # Database configuration
 export REDMINE_DATABASE_TYPE="${REDMINE_DATABASE_TYPE:-mariadb}" # only used during the first initialization
diff --git a/bitnami/redmine/README.md b/bitnami/redmine/README.md
index 1ef50171f2fc..12afacacc963 100644
--- a/bitnami/redmine/README.md
+++ b/bitnami/redmine/README.md
@@ -276,6 +276,8 @@ To configure Redmine to send email using SMTP you can set the following environm
 - `REDMINE_SMTP_PASSWORD`: SMTP account password.
 - `REDMINE_SMTP_PROTOCOL`: If specified, SMTP protocol to use. Allowed values: *tls*, *ssl*. No default.
 - `REDMINE_SMTP_AUTH`: SMTP authentication method. Allowed values: *login*, *plain*, *cram_md5*. Default: **login**.
+- `REDMINE_SMTP_CA_FILE`: Path to the SMTP CA file. Default: **/etc/ssl/certs/ca-certificates.crt**.
+- `REDMINE_SMTP_VERIFY_MODE`: SMTP sets the level of verification for the SSL certificate presented by the server. Allowed values: *none*, *peer*. Default: **peer**.
 
 #### Examples