From f26abdf6ac6154bf1af43b3c7cc704d68a78fca1 Mon Sep 17 00:00:00 2001 From: Fredrik Jonsson <frjo@xdeb.org> Date: Thu, 1 Nov 2018 14:25:02 +0100 Subject: [PATCH] Allow STAFF_EMAIL_DOMAINS to be set as env var. Default to original value. --- opentech/settings/base.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/opentech/settings/base.py b/opentech/settings/base.py index b19064656..dd2c51d8b 100644 --- a/opentech/settings/base.py +++ b/opentech/settings/base.py @@ -378,14 +378,19 @@ ESI_ENABLED = False ENABLE_STYLEGUIDE = False DEBUGTOOLBAR = False +# Staff e-mail domain + +if 'STAFF_EMAIL_DOMAINS' in env: + STAFF_EMAIL_DOMAINS = env['STAFF_EMAIL_DOMAINS'].split(',') +else: + STAFF_EMAIL_DOMAINS = ['opentech.fund'] + # Social Auth SOCIAL_AUTH_URL_NAMESPACE = 'social' # Set the Google OAuth2 credentials in ENV variables or local.py # To create a new set of credentials, go to https://console.developers.google.com/apis/credentials # Make sure the Google+ API is enabled for your API project -STAFF_EMAIL_DOMAINS = ['opentech.fund'] - if 'SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_DOMAINS' in env: SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_DOMAINS = env['SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_DOMAINS'].split(',') else: -- GitLab