From 921d5bd4a3b6da453ca4d8cb88d6d489532601c4 Mon Sep 17 00:00:00 2001 From: Klaas van Schelven Date: Sat, 12 Apr 2025 21:36:52 +0200 Subject: [PATCH] Add EMAIL_USE_SSL to settings/conf_templates This is the settings for implicit SSL/TLS on port 465 (rather than STARTTLS on port 587) --- bugsink/conf_templates/docker.py.template | 1 + bugsink/conf_templates/local.py.template | 1 + bugsink/conf_templates/singleserver.py.template | 1 + bugsink/views.py | 1 + 4 files changed, 4 insertions(+) diff --git a/bugsink/conf_templates/docker.py.template b/bugsink/conf_templates/docker.py.template index 71d89b1..becd347 100644 --- a/bugsink/conf_templates/docker.py.template +++ b/bugsink/conf_templates/docker.py.template @@ -101,6 +101,7 @@ if os.getenv("EMAIL_HOST"): EMAIL_HOST_PASSWORD = os.getenv("EMAIL_HOST_PASSWORD") EMAIL_PORT = int(os.getenv("EMAIL_PORT", 587)) EMAIL_USE_TLS = os.getenv("EMAIL_USE_TLS", "True").lower() in ("true", "1", "yes") + EMAIL_USE_SSL = os.getenv("EMAIL_USE_SSL", "True").lower() in ("true", "1", "yes") else: # print("WARNING: EMAIL_HOST not set; email will not be sent") EMAIL_BACKEND = "bugsink.email_backends.QuietConsoleEmailBackend" diff --git a/bugsink/conf_templates/local.py.template b/bugsink/conf_templates/local.py.template index 0c3f7ed..9205d4e 100644 --- a/bugsink/conf_templates/local.py.template +++ b/bugsink/conf_templates/local.py.template @@ -47,6 +47,7 @@ EMAIL_BACKEND = "bugsink.email_backends.QuietConsoleEmailBackend" # EMAIL_HOST_PASSWORD = ... # EMAIL_PORT = ... # EMAIL_USE_TLS = ... +# EMAIL_USE_SSL = ... # SERVER_EMAIL = DEFAULT_FROM_EMAIL = "Bugsink " # constants for "create by" (user/team/project) settings diff --git a/bugsink/conf_templates/singleserver.py.template b/bugsink/conf_templates/singleserver.py.template index e2de270..b95012a 100644 --- a/bugsink/conf_templates/singleserver.py.template +++ b/bugsink/conf_templates/singleserver.py.template @@ -57,6 +57,7 @@ EMAIL_BACKEND = "bugsink.email_backends.QuietConsoleEmailBackend" # EMAIL_HOST_PASSWORD = ... # EMAIL_PORT = ... # EMAIL_USE_TLS = ... +# EMAIL_USE_SSL = ... SERVER_EMAIL = DEFAULT_FROM_EMAIL = "Bugsink " diff --git a/bugsink/views.py b/bugsink/views.py index f20fa81..86b6fc2 100644 --- a/bugsink/views.py +++ b/bugsink/views.py @@ -133,6 +133,7 @@ def settings_view(request): "EMAIL_HOST_PASSWORD", "EMAIL_PORT", "EMAIL_USE_TLS", + "EMAIL_USE_SSL", "EMAIL_BACKEND", "DEFAULT_FROM_EMAIL", )