From d5241b88af72c579fcb2b34a94777bdbba916054 Mon Sep 17 00:00:00 2001
From: Tanner Prestegard <tanner.prestegard@ligo.org>
Date: Wed, 27 Feb 2019 10:44:57 -0600
Subject: [PATCH] Get ALERT_EMAIL_FROM from envvars for container deployment
---
Dockerfile | 1 +
config/settings/container/base.py | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 8fae5224b..c08b4724f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -83,6 +83,7 @@ RUN DJANGO_SETTINGS_MODULE=${SETTINGS_MODULE} \
DJANGO_DB_PASSWORD=fake_password \
DJANGO_SECRET_KEY=fake_key \
DJANGO_PRIMARY_FQDN=fake_fqdn \
+ DJANGO_ALERT_EMAIL_FROM=fake_email \
LVALERT_USER=fake_user \
LVALERT_PASSWORD=fake_password \
LVALERT_SERVER=fake_server \
diff --git a/config/settings/container/base.py b/config/settings/container/base.py
index 30b1d63de..d2277c2c2 100644
--- a/config/settings/container/base.py
+++ b/config/settings/container/base.py
@@ -62,6 +62,10 @@ EMAIL_USE_TLS = True
EMAIL_HOST = os.environ.get('SMTP_HOST', 'localhost')
EMAIL_HOST_USER = os.environ.get('SMTP_USERNAME', '')
EMAIL_HOST_PASSWORD = os.environ.get('SMTP_PASSWORD', '')
+ALERT_EMAIL_FROM = os.environ.get('DJANGO_ALERT_EMAIL_FROM', None)
+if ALERT_EMAIL_FROM is None:
+ raise ImproperlyConfigured(
+ "Could not get 'alert from email' from envvars.")
# Database settings -----------------------------------------------------------
DATABASES = {
@@ -106,7 +110,6 @@ ALLOWED_HOSTS += [SERVER_FQDN]
# Email settings - dependent on server hostname and FQDN ----------------------
SERVER_EMAIL = 'GraceDB <gracedb@{fqdn}>'.format(fqdn=SERVER_FQDN)
-ALERT_EMAIL_FROM = SERVER_EMAIL
ALERT_EMAIL_TO = []
ALERT_EMAIL_BCC = []
ALERT_TEST_EMAIL_FROM = SERVER_EMAIL
--
GitLab