From 0da2fb842fe38d17f3bd2002c4be04c0246efed2 Mon Sep 17 00:00:00 2001 From: Chris Dodge Date: Mon, 12 Aug 2013 13:29:15 -0400 Subject: [PATCH 1/3] Add new setting to cms project --- cms/envs/aws.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cms/envs/aws.py b/cms/envs/aws.py index 339425fee5..c2ba51a5f8 100644 --- a/cms/envs/aws.py +++ b/cms/envs/aws.py @@ -107,6 +107,7 @@ DEFAULT_FEEDBACK_EMAIL = ENV_TOKENS.get('DEFAULT_FEEDBACK_EMAIL', DEFAULT_FEEDBA ADMINS = ENV_TOKENS.get('ADMINS', ADMINS) SERVER_EMAIL = ENV_TOKENS.get('SERVER_EMAIL', SERVER_EMAIL) MKTG_URLS = ENV_TOKENS.get('MKTG_URLS', MKTG_URLS) +TECH_SUPPORT_EMAIL = ENV_TOKENS.get('TECH_SUPPORT_EMAIL', TECH_SUPPORT_EMAIL) COURSES_WITH_UNSAFE_CODE = ENV_TOKENS.get("COURSES_WITH_UNSAFE_CODE", []) From 0231e64f3606ccc17eaba0e7f9983163b8eb7612 Mon Sep 17 00:00:00 2001 From: Chris Dodge Date: Mon, 12 Aug 2013 13:41:05 -0400 Subject: [PATCH 2/3] also define TECH_SUPPORT_EMAIL in cms.envs.common config file --- cms/envs/common.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cms/envs/common.py b/cms/envs/common.py index 40084c20ae..d39f2963b1 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -184,6 +184,7 @@ EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' DEFAULT_FROM_EMAIL = 'registration@edx.org' DEFAULT_FEEDBACK_EMAIL = 'feedback@edx.org' SERVER_EMAIL = 'devops@edx.org' +TECH_SUPPORT_EMAIL = 'technical@edx.org' ADMINS = () MANAGERS = ADMINS From 7fd5a00c2c50bf4da57428291926abd4c01d0ae2 Mon Sep 17 00:00:00 2001 From: Chris Dodge Date: Mon, 12 Aug 2013 14:07:03 -0400 Subject: [PATCH 3/3] import default TECH_SUPPORT_EMAIL setting from LMS --- cms/envs/common.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cms/envs/common.py b/cms/envs/common.py index d39f2963b1..e0a41de212 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -25,7 +25,7 @@ Longer TODO: import sys import lms.envs.common -from lms.envs.common import USE_TZ +from lms.envs.common import USE_TZ, TECH_SUPPORT_EMAIL from path import path ############################ FEATURE CONFIGURATION ############################# @@ -184,7 +184,6 @@ EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' DEFAULT_FROM_EMAIL = 'registration@edx.org' DEFAULT_FEEDBACK_EMAIL = 'feedback@edx.org' SERVER_EMAIL = 'devops@edx.org' -TECH_SUPPORT_EMAIL = 'technical@edx.org' ADMINS = () MANAGERS = ADMINS