summaryrefslogtreecommitdiff
path: root/server/src
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2015-10-01 17:28:10 +0200
committerRuben Pollan <meskio@sindominio.net>2015-10-01 17:28:10 +0200
commit2f1db98804e85cdba362192af0530ad3dfdcafc3 (patch)
tree247173a5d649e23202c5d13aebf2aeb71007b4c2 /server/src
parent4964eed77748d65df30847a5fe0a608a163af7e0 (diff)
parent7a0dba8b7008aca8652f7b334352d9ca63cb2054 (diff)
Merge branch 'pixelated/develop' into develop
- Release: 0.8.0
Diffstat (limited to 'server/src')
-rw-r--r--server/src/leap/soledad/server/__init__.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/server/src/leap/soledad/server/__init__.py b/server/src/leap/soledad/server/__init__.py
index bb1c6db0..1273d15c 100644
--- a/server/src/leap/soledad/server/__init__.py
+++ b/server/src/leap/soledad/server/__init__.py
@@ -283,19 +283,20 @@ def load_configuration(file_path):
@return: A dictionary with the configuration.
@rtype: dict
"""
- conf = {
+ defaults = {
'couch_url': 'http://localhost:5984',
- 'create_cmd': None
+ 'create_cmd': None,
+ 'admin_netrc': '/etc/couchdb/couchdb-admin.netrc',
}
config = configparser.ConfigParser()
config.read(file_path)
if 'soledad-server' in config:
- for key in conf:
+ for key in defaults:
if key in config['soledad-server']:
- conf[key] = config['soledad-server'][key]
+ defaults[key] = config['soledad-server'][key]
# TODO: implement basic parsing/sanitization of options comming from
# config file.
- return conf
+ return defaults
# ----------------------------------------------------------------------------