diff options
| author | Kali Kaneko <kali@leap.se> | 2015-06-10 12:06:26 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2015-06-10 12:06:26 -0400 |
| commit | 2d4df4e59336f4f956fc8cd9df8fd4a996f1b292 (patch) | |
| tree | 268922c34889693dbf57a9010e6aefcac729336b /server/src | |
| parent | d7ebd62ea541a508eed79d5ffe47011f94227bc8 (diff) | |
| parent | bbb19ed9a755a079da5b79567cb98a921c02f2f4 (diff) | |
Merge tag '0.6.5' into debian/experimental
Tag version 0.6.5.
Diffstat (limited to 'server/src')
| -rw-r--r-- | server/src/leap/soledad/server/__init__.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/server/src/leap/soledad/server/__init__.py b/server/src/leap/soledad/server/__init__.py index cd006f51..adb5b561 100644 --- a/server/src/leap/soledad/server/__init__.py +++ b/server/src/leap/soledad/server/__init__.py @@ -296,10 +296,7 @@ def load_configuration(file_path): def application(environ, start_response): conf = load_configuration('/etc/leap/soledad-server.conf') - state = CouchServerState( - conf['couch_url'], - SoledadApp.SHARED_DB_NAME, - SoledadTokenAuthMiddleware.TOKENS_DB) + state = CouchServerState(conf['couch_url']) # WSGI application that may be used by `twistd -web` application = GzipMiddleware( SoledadTokenAuthMiddleware(SoledadApp(state))) |