Merge branch 'master' into feature/rocky/discussion

6de05997 · David Ormsbee · e4890a8b · 22cbc1bd · 6de05997
Commit 6de05997 authored Aug 23, 2012 by David Ormsbee
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletions

lms/envs/aws.py
+2 -1

No files found.
--- 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.