aboutsummaryrefslogtreecommitdiffstats
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
commit1db9f7772a9266edd84c33592322c5dd2e4aeae8 (patch)
tree7e7d8de696d9afebc1ab23ac292e16c345d32c25
parentb0ef65a9126dc661a9eff59840f1d64f875003f4 (diff)
parent766dd613a68451652a54f7eab7f476c4b66dbdf8 (diff)
Merge "Allow Configuring 'DEFAULT_EMAIL_FROM' in Django"
-rw-r--r--config.env.sample1
-rw-r--r--src/pharos_dashboard/settings.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/config.env.sample b/config.env.sample
index edd2bf0..c36e52a 100644
--- a/config.env.sample
+++ b/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/src/pharos_dashboard/settings.py b/src/pharos_dashboard/settings.py
index 361c4a1..0ac5479 100644
--- a/src/pharos_dashboard/settings.py
+++ b/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')