Merge pull request #1982 from edx/dhm/doc_store_config

Move default DOC_STORE_CONFIG to common
This commit is contained in:
Don Mitchell
2013-12-18 07:33:31 -08:00
4 changed files with 6 additions and 14 deletions

View File

@@ -25,7 +25,7 @@ Longer TODO:
import sys
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 lms.lib.xblock.mixin import LmsBlockMixin

View File

@@ -21,12 +21,6 @@ LOGGING = get_logger_config(ENV_ROOT / "log",
dev_env=True,
debug=True)
DOC_STORE_CONFIG = {
'host': 'localhost',
'db': 'xmodule',
'collection': 'modulestore',
}
modulestore_options = {
'default_class': 'xmodule.raw_module.RawDescriptor',
'fs_root': GITHUB_REPO_ROOT,

View File

@@ -22,12 +22,6 @@ FEATURES['ENABLE_LMS_MIGRATION'] = False
META_UNIVERSITIES = {}
DOC_STORE_CONFIG = {
'host': 'localhost',
'db': 'xmodule',
'collection': 'modulestore',
}
modulestore_options = {
'default_class': 'xmodule.raw_module.RawDescriptor',
'fs_root': DATA_DIR,

View File

@@ -390,7 +390,11 @@ MODULESTORE = {
}
}
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
# needed?