From 7720c0fc8df9ac4dcea9526c6895ce6eaf8fb337 Mon Sep 17 00:00:00 2001
From: Jason Bau <jbau@stanford.edu>
Date: Fri, 3 May 2013 11:45:21 -0700
Subject: [PATCH] Inserts overrides in env.lms.aws for email settings and
 timezone

overrides what is set in env.lms.common using the lms.env.json
file
---
 lms/envs/aws.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lms/envs/aws.py b/lms/envs/aws.py
index aa30315eca..df81c1e3a9 100644
--- 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