From 408e26a0c1921fc8d9a45416b8886c28d455edc2 Mon Sep 17 00:00:00 2001 From: Jason Bau Date: Thu, 9 May 2013 16:21:55 -0700 Subject: [PATCH] parameterizes CMS email settings --- cms/envs/aws.py | 10 ++++++++++ cms/envs/common.py | 1 + 2 files changed, 11 insertions(+) diff --git a/cms/envs/aws.py b/cms/envs/aws.py index 59ad8b835e..05c57d8263 100644 --- a/cms/envs/aws.py +++ b/cms/envs/aws.py @@ -43,6 +43,16 @@ CACHES = ENV_TOKENS['CACHES'] SESSION_COOKIE_DOMAIN = ENV_TOKENS.get('SESSION_COOKIE_DOMAIN') +#Email overrides +DEFAULT_FROM_EMAIL = ENV_TOKENS.get('DEFAULT_FROM_EMAIL', DEFAULT_FROM_EMAIL) +DEFAULT_FEEDBACK_EMAIL = ENV_TOKENS.get('DEFAULT_FEEDBACK_EMAIL', DEFAULT_FEEDBACK_EMAIL) +ADMINS = ENV_TOKENS.get('ADMINS', ADMINS) +SERVER_EMAIL = ENV_TOKENS.get('SERVER_EMAIL', SERVER_EMAIL) + +#Timezone overrides +TIME_ZONE = ENV_TOKENS.get('TIME_ZONE', TIME_ZONE) + + for feature, value in ENV_TOKENS.get('MITX_FEATURES', {}).items(): MITX_FEATURES[feature] = value diff --git a/cms/envs/common.py b/cms/envs/common.py index 8effc773e0..a53830082b 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -152,6 +152,7 @@ IGNORABLE_404_ENDS = ('favicon.ico') 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' ADMINS = ( ('edX Admins', 'admin@edx.org'), )