summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2015-04-09 12:20:19 -0300
committerdrebs <drebs@leap.se>2015-04-09 14:34:31 -0300
commit1edacb035f0fc65ca26f8b1324b5cff6fdabf7bf (patch)
treeeb0d155b4789bdabfed1c49e514358dd523944ed /server
parent4a8413505faf70138f5b16dc4a845c4e0219b872 (diff)
[fix] remove unneded params to CouchServerState
This commit removes some leftover code from a time when Soledad Server used to check for permissions on certain databases when starting (i.e. shared and tokens databases). This was later removed as correct permissions enforcement was relayed to tapicero. Closes: #6833.
Diffstat (limited to 'server')
-rw-r--r--server/changes/bug_6833_remove-unneeded-params-from-couch-server-state2
-rw-r--r--server/src/leap/soledad/server/__init__.py5
2 files changed, 3 insertions, 4 deletions
diff --git a/server/changes/bug_6833_remove-unneeded-params-from-couch-server-state b/server/changes/bug_6833_remove-unneeded-params-from-couch-server-state
new file mode 100644
index 00000000..2c927717
--- /dev/null
+++ b/server/changes/bug_6833_remove-unneeded-params-from-couch-server-state
@@ -0,0 +1,2 @@
+ o Remove unneeded parameters from CouchServerState initialization. Closes
+ #6833.
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)))