diff --git a/install/get-teamware.sh b/install/get-teamware.sh index e7a5e30a..cacf2c82 100644 --- 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 index 66b0fe46..c6a91b55 100644 --- 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