Merge pull request #294 from MITx/jarv/wiki_enabled

reading WIKI_ENABLED from env.json
2012-07-25 11:18:41 -07:00
parent dde48f122e dab92102d1
commit d1482e19ee
1 changed files with 1 additions and 0 deletions
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -35,6 +35,7 @@ CACHES = ENV_TOKENS['CACHES']
 for feature,value in ENV_TOKENS.get('MITX_FEATURES', {}).items():
    MITX_FEATURES[feature] = value

+WIKI_ENABLED = ENV_TOKENS.get('WIKI_ENABLED',WIKI_ENABLED)

 LOGGING = get_logger_config(LOG_DIR, 
                            logging_env=ENV_TOKENS['LOGGING_ENV'],