summaryrefslogtreecommitdiffstats
path: root/scalingo.json
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 /scalingo.json
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 'scalingo.json')
-rw-r--r--scalingo.json7
1 files changed, 6 insertions, 1 deletions
diff --git a/scalingo.json b/scalingo.json
index 511c1802a99..8c899297742 100644
--- a/scalingo.json
+++ b/scalingo.json
@@ -74,8 +74,13 @@
"description": "SMTP server certificate verification mode. Defaults is 'peer'.",
"required": false
},
+ "SMTP_ENABLE_STARTTLS": {
+ "description": "Enable STARTTLS? Default is 'auto'.",
+ "value": "auto",
+ "required": false
+ },
"SMTP_ENABLE_STARTTLS_AUTO": {
- "description": "Enable STARTTLS if SMTP server supports it? Default is true.",
+ "description": "Enable STARTTLS if SMTP server supports it? Deprecated by SMTP_ENABLE_STARTTLS.",
"required": false
},
"BUILDPACK_URL": {