From 8c9ebe851296e380e95db0487aa425cd8a2ffbbb Mon Sep 17 00:00:00 2001 From: Oleg Demakov Date: Thu, 1 Oct 2020 13:14:34 +0200 Subject: [PATCH] configurable emails config settings --- .../openedx/settings/partials/common_all.py | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tutor/templates/apps/openedx/settings/partials/common_all.py b/tutor/templates/apps/openedx/settings/partials/common_all.py index 350c7c3..38b4a6d 100644 --- a/tutor/templates/apps/openedx/settings/partials/common_all.py +++ b/tutor/templates/apps/openedx/settings/partials/common_all.py @@ -2,18 +2,18 @@ import json import os -DEFAULT_FROM_EMAIL = ENV_TOKENS["CONTACT_EMAIL"] -DEFAULT_FEEDBACK_EMAIL = ENV_TOKENS["CONTACT_EMAIL"] -SERVER_EMAIL = ENV_TOKENS["CONTACT_EMAIL"] -TECH_SUPPORT_EMAIL = ENV_TOKENS["CONTACT_EMAIL"] -CONTACT_EMAIL = ENV_TOKENS["CONTACT_EMAIL"] -BUGS_EMAIL = ENV_TOKENS["CONTACT_EMAIL"] -UNIVERSITY_EMAIL = ENV_TOKENS["CONTACT_EMAIL"] -PRESS_EMAIL = ENV_TOKENS["CONTACT_EMAIL"] -PAYMENT_SUPPORT_EMAIL = ENV_TOKENS["CONTACT_EMAIL"] -BULK_EMAIL_DEFAULT_FROM_EMAIL = "no-reply@" + ENV_TOKENS["LMS_BASE"] -API_ACCESS_MANAGER_EMAIL = ENV_TOKENS["CONTACT_EMAIL"] -API_ACCESS_FROM_EMAIL = ENV_TOKENS["CONTACT_EMAIL"] +DEFAULT_FROM_EMAIL = ENV_TOKENS.get("DEFAULT_FROM_EMAIL", ENV_TOKENS["CONTACT_EMAIL"]) +DEFAULT_FEEDBACK_EMAIL = ENV_TOKENS.get("DEFAULT_FEEDBACK_EMAIL", ENV_TOKENS["CONTACT_EMAIL"]) +SERVER_EMAIL = ENV_TOKENS.get("SERVER_EMAIL", ENV_TOKENS["CONTACT_EMAIL"]) +TECH_SUPPORT_EMAIL = ENV_TOKENS.get("TECH_SUPPORT_EMAIL", ENV_TOKENS["CONTACT_EMAIL"]) +CONTACT_EMAIL = ENV_TOKENS.get("CONTACT_EMAIL", ENV_TOKENS["CONTACT_EMAIL"]) +BUGS_EMAIL = ENV_TOKENS.get("BUGS_EMAIL", ENV_TOKENS["CONTACT_EMAIL"]) +UNIVERSITY_EMAIL = ENV_TOKENS.get("UNIVERSITY_EMAIL", ENV_TOKENS["CONTACT_EMAIL"]) +PRESS_EMAIL = ENV_TOKENS.get("PRESS_EMAIL", ENV_TOKENS["CONTACT_EMAIL"]) +PAYMENT_SUPPORT_EMAIL = ENV_TOKENS.get("PAYMENT_SUPPORT_EMAIL", ENV_TOKENS["CONTACT_EMAIL"]) +BULK_EMAIL_DEFAULT_FROM_EMAIL = ENV_TOKENS.get("BULK_EMAIL_DEFAULT_FROM_EMAIL", "no-reply@" + ENV_TOKENS["LMS_BASE"]) +API_ACCESS_MANAGER_EMAIL = ENV_TOKENS.get("API_ACCESS_MANAGER_EMAIL", ENV_TOKENS["CONTACT_EMAIL"]) +API_ACCESS_FROM_EMAIL = ENV_TOKENS.get("API_ACCESS_FROM_EMAIL", ENV_TOKENS["CONTACT_EMAIL"]) # Load module store settings from config files update_module_store_settings(MODULESTORE, doc_store_settings=DOC_STORE_CONFIG)