From 1edacb035f0fc65ca26f8b1324b5cff6fdabf7bf Mon Sep 17 00:00:00 2001 From: drebs Date: Thu, 9 Apr 2015 12:20:19 -0300 Subject: [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. --- .../changes/bug_6833_remove-unneeded-params-from-couch-server-state | 2 ++ server/src/leap/soledad/server/__init__.py | 5 +---- 2 files changed, 3 insertions(+), 4 deletions(-) create mode 100644 server/changes/bug_6833_remove-unneeded-params-from-couch-server-state (limited to 'server') 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))) -- cgit v1.2.3 From bbb19ed9a755a079da5b79567cb98a921c02f2f4 Mon Sep 17 00:00:00 2001 From: drebs Date: Thu, 9 Apr 2015 14:39:05 -0300 Subject: Fold in changes. --- server/changes/bug_6833_remove-unneeded-params-from-couch-server-state | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 server/changes/bug_6833_remove-unneeded-params-from-couch-server-state (limited to 'server') 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 deleted file mode 100644 index 2c927717..00000000 --- a/server/changes/bug_6833_remove-unneeded-params-from-couch-server-state +++ /dev/null @@ -1,2 +0,0 @@ - o Remove unneeded parameters from CouchServerState initialization. Closes - #6833. -- cgit v1.2.3