diff options
| author | Ruben Pollan <meskio@sindominio.net> | 2015-09-28 23:19:48 +0200 |
|---|---|---|
| committer | Ruben Pollan <meskio@sindominio.net> | 2015-09-28 23:19:48 +0200 |
| commit | 4de93f472ac224ef32beffa1acd1c98765519160 (patch) | |
| tree | 2b3065591d5f472ebd6e343b57af2f4c853b5acc /server/src/leap | |
| parent | 1566ac3885d566d0b3d70a44eaf0bd901b2d655e (diff) | |
| parent | 3c7a41574ed1a97ae168bbbc50b127d17694734a (diff) | |
Merge branch 'feat/create_db_using_cmd' into develop
- Releases: 0.8.0
Diffstat (limited to 'server/src/leap')
| -rw-r--r-- | server/src/leap/soledad/server/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/server/src/leap/soledad/server/__init__.py b/server/src/leap/soledad/server/__init__.py index 1b795016..bb1c6db0 100644 --- a/server/src/leap/soledad/server/__init__.py +++ b/server/src/leap/soledad/server/__init__.py @@ -285,6 +285,7 @@ def load_configuration(file_path): """ conf = { 'couch_url': 'http://localhost:5984', + 'create_cmd': None } config = configparser.ConfigParser() config.read(file_path) @@ -303,7 +304,7 @@ def load_configuration(file_path): def application(environ, start_response): conf = load_configuration('/etc/leap/soledad-server.conf') - state = CouchServerState(conf['couch_url']) + state = CouchServerState(conf['couch_url'], create_cmd=conf['create_cmd']) # WSGI application that may be used by `twistd -web` application = GzipMiddleware( SoledadTokenAuthMiddleware(SoledadApp(state))) |