aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mediagoblin/config_spec.ini2
-rw-r--r--mediagoblin/db/open.py2
-rw-r--r--mediagoblin/init/celery/__init__.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/mediagoblin/config_spec.ini b/mediagoblin/config_spec.ini
index b6356b0e..28be5f34 100644
--- a/mediagoblin/config_spec.ini
+++ b/mediagoblin/config_spec.ini
@@ -1,7 +1,7 @@
[mediagoblin]
# database stuff
db_host = string()
-db_name = string()
+db_name = string(default="mediagoblin")
db_port = integer()
#
diff --git a/mediagoblin/db/open.py b/mediagoblin/db/open.py
index cae33394..b6987677 100644
--- a/mediagoblin/db/open.py
+++ b/mediagoblin/db/open.py
@@ -30,7 +30,7 @@ def connect_database_from_config(app_config):
def setup_connection_and_db_from_config(app_config):
connection = connect_database_from_config(app_config)
- database_path = app_config.get('db_name', 'mediagoblin')
+ database_path = app_config['db_name']
db = connection[database_path]
models.register_models(connection)
# Could configure indexes here on db
diff --git a/mediagoblin/init/celery/__init__.py b/mediagoblin/init/celery/__init__.py
index 67c3dfa0..bfae954e 100644
--- a/mediagoblin/init/celery/__init__.py
+++ b/mediagoblin/init/celery/__init__.py
@@ -62,7 +62,7 @@ def setup_celery_from_config(app_config, global_config,
celery_mongo_settings['port'] = app_config['db_port']
if celery_settings['BROKER_BACKEND'] == 'mongodb':
celery_settings['BROKER_PORT'] = app_config['db_port']
- celery_mongo_settings['database'] = app_config.get('db_name', 'mediagoblin')
+ celery_mongo_settings['database'] = app_config['db_name']
celery_settings['CELERY_MONGODB_BACKEND_SETTINGS'] = celery_mongo_settings