pull master

2013-05-03 15:18:45 -04:00
parent e6334584d6 5d729c306b
commit 138e0569dd
1 changed files with 8 additions and 0 deletions
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -60,6 +60,14 @@ LOG_DIR = ENV_TOKENS['LOG_DIR']

 CACHES = ENV_TOKENS['CACHES']

+#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)
+
+#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