about summary refs log tree commit diff
path: root/chart/templates
diff options
context:
space:
mode:
authorF <f@erbridge.co.uk>2022-11-10 20:06:21 +0000
committerGitHub <noreply@github.com>2022-11-10 21:06:21 +0100
commit9feba112a704edc23b4c2240a546363f9e1158b1 (patch)
tree5b14be333972eb24aa37348c87a1798f323d49c0 /chart/templates
parent1615c3eb6ecbadb5650f02d48e970e4f35d594d1 (diff)
Make enable_starttls configurable by envvars (#20321)
ENABLE_STARTTLS is designed to replace ENABLE_STARTTLS_AUTO by accepting
three values: 'auto' (the default), 'always', and 'never'. If
ENABLE_STARTTLS isn't provided, we fall back to ENABLE_STARTTLS_AUTO. In
this way, this change should be fully backwards compatible.

Resolves #20311
Diffstat (limited to 'chart/templates')
-rw-r--r--chart/templates/configmap-env.yaml3
1 files changed, 3 insertions, 0 deletions
diff --git a/chart/templates/configmap-env.yaml b/chart/templates/configmap-env.yaml
index 12da91cf9..00e60f315 100644
--- a/chart/templates/configmap-env.yaml
+++ b/chart/templates/configmap-env.yaml
@@ -58,6 +58,9 @@ data:
   {{- if .Values.mastodon.smtp.domain }}
   SMTP_DOMAIN: {{ .Values.mastodon.smtp.domain }}
   {{- end }}
+  {{- if .Values.mastodon.smtp.enable_starttls }}
+  SMTP_ENABLE_STARTTLS: {{ .Values.mastodon.smtp.enable_starttls | quote }}
+  {{- end }}
   {{- if .Values.mastodon.smtp.enable_starttls_auto }}
   SMTP_ENABLE_STARTTLS_AUTO: {{ .Values.mastodon.smtp.enable_starttls_auto | quote }}
   {{- end }}