Merge pull request #402 from GateNLP/smtp-no-tls

Add explicit setting for "no email security"
GateNLP · May 8, 2024 · fdafb21 · fdafb21
2 parents 4585c71 + 53b9a56
commit fdafb21
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/install/get-teamware.sh b/install/get-teamware.sh
@@ -175,7 +175,7 @@ else
 
     case "$EMAIL_SECURE" in
       [Nn]*)
-        DJANGO_EMAIL_SECURITY=
+        DJANGO_EMAIL_SECURITY=none
         ;;
 
       *)

diff --git a/teamware/settings/base.py b/teamware/settings/base.py
@@ -214,8 +214,10 @@
         EMAIL_USE_SSL = True
     elif os.environ['DJANGO_EMAIL_SECURITY'].lower() == 'tls':
         EMAIL_USE_TLS = True
+    elif os.environ['DJANGO_EMAIL_SECURITY'].lower() in ['', 'none']:
+        pass
     else:
-        raise ValueError("DJANGO_EMAIL_SECURITY, if set, must be either SSL or TLS")
+        raise ValueError("DJANGO_EMAIL_SECURITY, if set, must be either SSL or TLS, or 'none' for no security")
 
     if 'DJANGO_EMAIL_CLIENT_CERTIFICATE' in os.environ:
         # If certificate is set then key must also, and we want to raise an