moep/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into task/4046/compute_hdd_sdd

Browse source
This commit is contained in:
PCoder 2018-01-03 09:22:25 +01:00
commit b4fbd59144
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Changelog
View file

@ -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 1.3: 2017-12-27
* #3911: [dcl] Integrate resend activation link into dcl landing payment page * #3911: [dcl] Integrate resend activation link into dcl landing payment page
* #3972: [hosting] Add ungleich company info to invoice footer * #3972: [hosting] Add ungleich company info to invoice footer

8
dynamicweb/settings/base.py
View file

@ -63,8 +63,12 @@ LOGIN_URL = None
LOGOUT_URL = None LOGOUT_URL = None
LOGIN_REDIRECT_URL = None LOGIN_REDIRECT_URL = None
EMAIL_HOST = "localhost" EMAIL_HOST = env("EMAIL_HOST")
EMAIL_PORT = 25 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') SECRET_KEY = env('DJANGO_SECRET_KEY')
# Application definition # Application definition