Merge branch 'master' into feature/rocky/discussion

2012-08-23 07:22:49 -04:00
parent e4890a8bff 22cbc1bdf8
commit 6de0599731
1 changed files with 2 additions and 1 deletions
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -47,7 +47,8 @@ LOGGING = get_logger_config(LOG_DIR,
                            syslog_addr=(ENV_TOKENS['SYSLOG_SERVER'], 514),
                            debug=False)

-COURSE_LISTINGS = ENV_TOKENS['COURSE_LISTINGS']
+COURSE_LISTINGS = ENV_TOKENS.get('COURSE_LISTINGS', {})
+SUBDOMAIN_BRANDING = ENV_TOKENS.get('SUBDOMAIN_BRANDING', {})

 ############################## SECURE AUTH ITEMS ###############################
 # Secret things: passwords, access keys, etc.