Commit 6700a3ec by e0d

Fixes for the AWS environment config.

parent e2d23fcc
...@@ -153,7 +153,7 @@ AWS_SECRET_ACCESS_KEY = AUTH_TOKENS["AWS_SECRET_ACCESS_KEY"] ...@@ -153,7 +153,7 @@ AWS_SECRET_ACCESS_KEY = AUTH_TOKENS["AWS_SECRET_ACCESS_KEY"]
DATABASES = AUTH_TOKENS['DATABASES'] DATABASES = AUTH_TOKENS['DATABASES']
MODULESTORE = AUTH_TOKENS['MODULESTORE'] MODULESTORE = AUTH_TOKENS['MODULESTORE']
CONTENTSTORE = AUTH_TOKENS['CONTENTSTORE'] CONTENTSTORE = AUTH_TOKENS['CONTENTSTORE']
DOC_STORE_CONFIG = MODULESTORE['default']['DOC_STORE_CONFIG']
# Datadog for events! # Datadog for events!
DATADOG = AUTH_TOKENS.get("DATADOG", {}) DATADOG = AUTH_TOKENS.get("DATADOG", {})
DATADOG.update(ENV_TOKENS.get("DATADOG", {})) DATADOG.update(ENV_TOKENS.get("DATADOG", {}))
......
...@@ -441,3 +441,5 @@ TRACKING_BACKENDS = { ...@@ -441,3 +441,5 @@ TRACKING_BACKENDS = {
# names/passwords. Heartbeat events are likely not interesting. # names/passwords. Heartbeat events are likely not interesting.
TRACKING_IGNORE_URL_PATTERNS = [r'^/event', r'^/login', r'^/heartbeat'] TRACKING_IGNORE_URL_PATTERNS = [r'^/event', r'^/login', r'^/heartbeat']
TRACKING_ENABLED = True TRACKING_ENABLED = True
DOC_STORE_CONFIG = None
...@@ -236,6 +236,7 @@ XQUEUE_INTERFACE = AUTH_TOKENS['XQUEUE_INTERFACE'] ...@@ -236,6 +236,7 @@ XQUEUE_INTERFACE = AUTH_TOKENS['XQUEUE_INTERFACE']
# use the one from common.py # use the one from common.py
MODULESTORE = AUTH_TOKENS.get('MODULESTORE', MODULESTORE) MODULESTORE = AUTH_TOKENS.get('MODULESTORE', MODULESTORE)
CONTENTSTORE = AUTH_TOKENS.get('CONTENTSTORE', CONTENTSTORE) 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 = AUTH_TOKENS.get('OPEN_ENDED_GRADING_INTERFACE',
OPEN_ENDED_GRADING_INTERFACE) OPEN_ENDED_GRADING_INTERFACE)
......
...@@ -378,6 +378,7 @@ MODULESTORE = { ...@@ -378,6 +378,7 @@ MODULESTORE = {
} }
} }
CONTENTSTORE = None CONTENTSTORE = None
DOC_STORE_CONFIG = None
# Should we initialize the modulestores at startup, or wait until they are # Should we initialize the modulestores at startup, or wait until they are
# needed? # needed?
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment