From 4bf61d6d35036e4fd8b27b4340444ab193946919 Mon Sep 17 00:00:00 2001 From: Sofiane Bebert Date: Sun, 20 Jun 2021 12:37:06 +0100 Subject: [PATCH] fix: set default CONTACT_MAILING_ADDRESS --- CHANGELOG.md | 3 ++- tutor/templates/apps/openedx/settings/partials/common_all.py | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7cfda78..e1ae4d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ Note: Breaking changes between versions are indicated by "💥". - [Bugfix] Fix "Invalid command argument" during upgrade from Koa to Lilac. - [Bugfix] Fix mysql initialisation in docker-compose==2.0.0beta4. - [Improvement] Tutor is now published on pypi as "tutor". +- [Improvement] Set the default contact mailing email address ## v12.0.1 (2021-06-22) @@ -748,4 +749,4 @@ Note: Breaking changes between versions are indicated by "💥". - 2018-08-27 [Improvement] Add development requirements to openedx image. - 2018-08-27 [Bugfix] Upgrade mongodb. - 2018-08-19 [Improvement] Make Xqueue an optional feature. -- 2018-08-16 [Feature] Add HTTPS support. +- 2018-08-16 [Feature] Add HTTPS support. \ No newline at end of file diff --git a/tutor/templates/apps/openedx/settings/partials/common_all.py b/tutor/templates/apps/openedx/settings/partials/common_all.py index 1f4186f..634093c 100644 --- a/tutor/templates/apps/openedx/settings/partials/common_all.py +++ b/tutor/templates/apps/openedx/settings/partials/common_all.py @@ -39,6 +39,8 @@ ELASTIC_SEARCH_CONFIG = [{ "port": {{ ELASTICSEARCH_PORT }}, }] +CONTACT_MAILING_ADDRESS = "{{ PLATFORM_NAME }} - {% if ENABLE_HTTPS %}https{% else %}http{% endif %}://{{ LMS_HOST }}" + 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"])