Commit 94d3a73a by Don Mitchell

Merge pull request #1982 from edx/dhm/doc_store_config

Move default DOC_STORE_CONFIG to common
parents 7925ca1e 5f251797
...@@ -25,7 +25,7 @@ Longer TODO: ...@@ -25,7 +25,7 @@ Longer TODO:
import sys import sys
import lms.envs.common import lms.envs.common
from lms.envs.common import USE_TZ, TECH_SUPPORT_EMAIL, PLATFORM_NAME, BUGS_EMAIL from lms.envs.common import USE_TZ, TECH_SUPPORT_EMAIL, PLATFORM_NAME, BUGS_EMAIL, DOC_STORE_CONFIG
from path import path from path import path
from lms.lib.xblock.mixin import LmsBlockMixin from lms.lib.xblock.mixin import LmsBlockMixin
......
...@@ -21,12 +21,6 @@ LOGGING = get_logger_config(ENV_ROOT / "log", ...@@ -21,12 +21,6 @@ LOGGING = get_logger_config(ENV_ROOT / "log",
dev_env=True, dev_env=True,
debug=True) debug=True)
DOC_STORE_CONFIG = {
'host': 'localhost',
'db': 'xmodule',
'collection': 'modulestore',
}
modulestore_options = { modulestore_options = {
'default_class': 'xmodule.raw_module.RawDescriptor', 'default_class': 'xmodule.raw_module.RawDescriptor',
'fs_root': GITHUB_REPO_ROOT, 'fs_root': GITHUB_REPO_ROOT,
......
...@@ -22,12 +22,6 @@ FEATURES['ENABLE_LMS_MIGRATION'] = False ...@@ -22,12 +22,6 @@ FEATURES['ENABLE_LMS_MIGRATION'] = False
META_UNIVERSITIES = {} META_UNIVERSITIES = {}
DOC_STORE_CONFIG = {
'host': 'localhost',
'db': 'xmodule',
'collection': 'modulestore',
}
modulestore_options = { modulestore_options = {
'default_class': 'xmodule.raw_module.RawDescriptor', 'default_class': 'xmodule.raw_module.RawDescriptor',
'fs_root': DATA_DIR, 'fs_root': DATA_DIR,
......
...@@ -390,7 +390,11 @@ MODULESTORE = { ...@@ -390,7 +390,11 @@ MODULESTORE = {
} }
} }
CONTENTSTORE = None CONTENTSTORE = None
DOC_STORE_CONFIG = None DOC_STORE_CONFIG = {
'host': 'localhost',
'db': 'xmodule',
'collection': 'modulestore',
}
# 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