diff options
| author | Kali Kaneko <kali@leap.se> | 2015-10-06 10:56:27 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2015-10-06 10:56:27 -0400 |
| commit | 9975e9b4ecc553d13a5e5b283257af9fedab51bf (patch) | |
| tree | ce360620d46ec010a5af0035eb99394c86bdf26f /server/src | |
| parent | be2a2966ec6c8d8608424cf934a9313de3cac822 (diff) | |
| parent | 16ca8e6b7514dab3d2135c2c407780761bcd10b7 (diff) | |
Merge branch 'develop' into debian/platform-0.8
Diffstat (limited to 'server/src')
| -rw-r--r-- | server/src/leap/soledad/server/__init__.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/server/src/leap/soledad/server/__init__.py b/server/src/leap/soledad/server/__init__.py index bb1c6db0..f64d07bf 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 # ---------------------------------------------------------------------------- @@ -303,7 +304,7 @@ def load_configuration(file_path): # ---------------------------------------------------------------------------- def application(environ, start_response): - conf = load_configuration('/etc/leap/soledad-server.conf') + conf = load_configuration('/etc/soledad/soledad-server.conf') state = CouchServerState(conf['couch_url'], create_cmd=conf['create_cmd']) # WSGI application that may be used by `twistd -web` application = GzipMiddleware( |