From ace2abc47e11044dc806dc81b324fc6c61caf4de Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 31 Dec 2017 00:58:37 +0100 Subject: [PATCH 1/2] Obtain email host, port and tls settings from env --- dynamicweb/settings/base.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py index 67734052..d66093ed 100644 --- a/dynamicweb/settings/base.py +++ b/dynamicweb/settings/base.py @@ -63,8 +63,12 @@ LOGIN_URL = None LOGOUT_URL = None LOGIN_REDIRECT_URL = None -EMAIL_HOST = "localhost" -EMAIL_PORT = 25 +EMAIL_HOST = env("EMAIL_HOST") +if not EMAIL_HOST: + EMAIL_HOST = "localhost" +EMAIL_PORT = int_env("EMAIL_PORT", 25) +EMAIL_USE_TLS = bool_env("EMAIL_USE_TLS") + SECRET_KEY = env('DJANGO_SECRET_KEY') # Application definition From 554335ae19134a04b5c602005647666b98d40a39 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 31 Dec 2017 18:28:41 +0100 Subject: [PATCH 2/2] Update Changelog for 1.3.1 --- Changelog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Changelog b/Changelog index 015600bb..4a9945f9 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,6 @@ +1.3.1: 2017-12-31 + * feature: [all] Load email configurations host, port and use_tls from env + * bugfix: [all] Use ungleich's smtp as relayhost for sending emails 1.3: 2017-12-27 * #3911: [dcl] Integrate resend activation link into dcl landing payment page * #3972: [hosting] Add ungleich company info to invoice footer