From 6700a3ec140971fbcde50a93e0f274429c81f51c Mon Sep 17 00:00:00 2001
From: e0d <ed@edx.org>
Date: Fri, 18 Oct 2013 15:56:15 -0400
Subject: [PATCH] Fixes for the AWS environment config.

---
 cms/envs/aws.py    | 2 +-
 cms/envs/common.py | 2 ++
 lms/envs/aws.py    | 1 +
 lms/envs/common.py | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/cms/envs/aws.py b/cms/envs/aws.py
index 9f6d5031ea..d101583d69 100644
--- a/cms/envs/aws.py
+++ b/cms/envs/aws.py
@@ -153,7 +153,7 @@ AWS_SECRET_ACCESS_KEY = AUTH_TOKENS["AWS_SECRET_ACCESS_KEY"]
 DATABASES = AUTH_TOKENS['DATABASES']
 MODULESTORE = AUTH_TOKENS['MODULESTORE']
 CONTENTSTORE = AUTH_TOKENS['CONTENTSTORE']
-
+DOC_STORE_CONFIG = MODULESTORE['default']['DOC_STORE_CONFIG']
 # Datadog for events!
 DATADOG = AUTH_TOKENS.get("DATADOG", {})
 DATADOG.update(ENV_TOKENS.get("DATADOG", {}))
diff --git a/cms/envs/common.py b/cms/envs/common.py
index 91815d09e6..80e040a71d 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -441,3 +441,5 @@ TRACKING_BACKENDS = {
 # names/passwords.  Heartbeat events are likely not interesting.
 TRACKING_IGNORE_URL_PATTERNS = [r'^/event', r'^/login', r'^/heartbeat']
 TRACKING_ENABLED = True
+
+DOC_STORE_CONFIG = None
diff --git a/lms/envs/aws.py b/lms/envs/aws.py
index ee56c6490a..f39aa4c6b6 100644
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -236,6 +236,7 @@ XQUEUE_INTERFACE = AUTH_TOKENS['XQUEUE_INTERFACE']
 # use the one from common.py
 MODULESTORE = AUTH_TOKENS.get('MODULESTORE', MODULESTORE)
 CONTENTSTORE = AUTH_TOKENS.get('CONTENTSTORE', CONTENTSTORE)
+DOC_STORE_CONFIG = MODULESTORE['default']['DOC_STORE_CONFIG']
 
 OPEN_ENDED_GRADING_INTERFACE = AUTH_TOKENS.get('OPEN_ENDED_GRADING_INTERFACE',
                                                OPEN_ENDED_GRADING_INTERFACE)
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 513f3e110f..c9c17d82c1 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -378,6 +378,7 @@ MODULESTORE = {
     }
 }
 CONTENTSTORE = None
+DOC_STORE_CONFIG = None
 
 # Should we initialize the modulestores at startup, or wait until they are
 # needed?