From a75cfedf1dc054b752f1f10d37f69ea2b35dc590 Mon Sep 17 00:00:00 2001 From: Igor Storozhuk Date: Wed, 23 Jan 2019 14:41:13 +0300 Subject: [PATCH 1/2] Add tls option to smtp settings --- changelogs/unreleased/1099-smtp-tls-settings-option.yml | 5 +++++ charts/gitlab/templates/_smtp.tpl | 3 +++ doc/installation/command-line-options.md | 1 + 3 files changed, 9 insertions(+) create mode 100644 changelogs/unreleased/1099-smtp-tls-settings-option.yml diff --git a/changelogs/unreleased/1099-smtp-tls-settings-option.yml b/changelogs/unreleased/1099-smtp-tls-settings-option.yml new file mode 100644 index 0000000000..c61b6725ac --- /dev/null +++ b/changelogs/unreleased/1099-smtp-tls-settings-option.yml @@ -0,0 +1,5 @@ +--- +title: Add tls option to smtp settings +merge_request: +author: Igor Storozhuk +type: added diff --git a/charts/gitlab/templates/_smtp.tpl b/charts/gitlab/templates/_smtp.tpl index ac17187af3..2a449c5e1b 100644 --- a/charts/gitlab/templates/_smtp.tpl +++ b/charts/gitlab/templates/_smtp.tpl @@ -25,6 +25,9 @@ ActionMailer::Base.smtp_settings = { {{- else }} enable_starttls_auto: false, {{- end }} + {{- if has .Values.global.smtp.tls (list true false) }} + tls: {{ .Values.global.smtp.tls }}, + {{- end }} {{- if eq .Values.global.smtp.openssl_verify_mode "peer" }} openssl_verify_mode: 'peer' {{- else if eq .Values.global.smtp.openssl_verify_mode "none" }} diff --git a/doc/installation/command-line-options.md b/doc/installation/command-line-options.md index 29523bcc3b..959aaeda4b 100644 --- a/doc/installation/command-line-options.md +++ b/doc/installation/command-line-options.md @@ -44,6 +44,7 @@ Tables below contain all the possible charts configurations that can be supplied | global.smtp.domain | Optional HELO domain for SMTP | "" | | global.smtp.authentication | Type of SMTP authentication ("plain", "login", "cram_md5", or "" for no authentication) | plain | | global.smtp.starttls_auto | Use STARTTLS if enabled on the mail server | false | +| global.smtp.tls | Enables SMTP/TLS (SMTPS: SMTP over direct TLS connection) | _none_ | | global.smtp.openssl_verify_mode | TLS verification mode ("none", "peer", or "ssl/tls") | peer | | global.email.from | Email address that appears as the sender for emails from GitLab | gitlab@example.com | | global.email.display_name | Name that appears as the sender for emails from GitLab | GitLab | -- GitLab From c1c3d371cb26b834219d2f8f29815f753194976f Mon Sep 17 00:00:00 2001 From: Igor Storozhuk Date: Wed, 30 Jan 2019 14:17:11 +0000 Subject: [PATCH 2/2] Update changelogs/unreleased/1099-smtp-tls-settings-option.yml --- changelogs/unreleased/1099-smtp-tls-settings-option.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelogs/unreleased/1099-smtp-tls-settings-option.yml b/changelogs/unreleased/1099-smtp-tls-settings-option.yml index c61b6725ac..9e271e1ab6 100644 --- a/changelogs/unreleased/1099-smtp-tls-settings-option.yml +++ b/changelogs/unreleased/1099-smtp-tls-settings-option.yml @@ -1,5 +1,5 @@ --- title: Add tls option to smtp settings -merge_request: +merge_request: 648 author: Igor Storozhuk type: added -- GitLab