summaryrefslogtreecommitdiff
path: root/server/src/leap/soledad
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2015-05-12 17:49:14 -0300
committerdrebs <drebs@leap.se>2015-05-12 17:49:14 -0300
commitfa7708e256ba56cd1e9913993d68611b4ae95824 (patch)
tree3149d5547b015baf0ca37ecd9421829feff5f45c /server/src/leap/soledad
parent365fa1603a977040a1891880a66118f196a54ac0 (diff)
parentbbb19ed9a755a079da5b79567cb98a921c02f2f4 (diff)
Merge tag '0.6.5'
Tag version 0.6.5.
Diffstat (limited to 'server/src/leap/soledad')
-rw-r--r--server/src/leap/soledad/server/__init__.py5
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)))