summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorParker Berberian <pberberian@iol.unh.edu>2018-02-28 15:05:26 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-02-28 15:05:26 +0000
commitb011d39bb162bf77f4bca8c6708b82973eb56eb6 (patch)
tree3a53e0417b22c8c032b192176531f0be092a2673
parent2085e52073396b265789fecd44a56c3b4e0d4970 (diff)
parent7844fd728e4f3e6191cb6a7f2faf0f94bd022d9a (diff)
Merge "Allow Configuring 'DEFAULT_EMAIL_FROM' in Django"stable/fraser
-rw-r--r--dashboard/config.env.sample1
-rw-r--r--dashboard/src/pharos_dashboard/settings.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/dashboard/config.env.sample b/dashboard/config.env.sample
index edd2bf0..c36e52a 100644
--- a/dashboard/config.env.sample
+++ b/dashboard/config.env.sample
@@ -31,3 +31,4 @@ EMAIL_HOST=
EMAIL_PORT=
EMAIL_HOST_USER=
EMAIL_HOST_PASSWORD=
+DEFAULT_FROM_EMAIL=webmaster@localhost
diff --git a/dashboard/src/pharos_dashboard/settings.py b/dashboard/src/pharos_dashboard/settings.py
index 361c4a1..0ac5479 100644
--- a/dashboard/src/pharos_dashboard/settings.py
+++ b/dashboard/src/pharos_dashboard/settings.py
@@ -196,3 +196,4 @@ EMAIL_PORT = os.environ['EMAIL_PORT']
EMAIL_HOST_USER = os.environ['EMAIL_HOST_USER']
EMAIL_HOST_PASSWORD = os.environ['EMAIL_HOST_PASSWORD']
EMAIL_USE_TLS=True
+DEFAULT_EMAIL_FROM = os.environ.get('DEFAULT_EMAIL_FROM', 'webmaster@localhost')