diff options
| author | Victor Shyba <victor1984@riseup.net> | 2017-08-22 05:22:33 -0300 |
|---|---|---|
| committer | drebs <drebs@riseup.net> | 2017-09-05 11:08:46 -0300 |
| commit | 9f4739c4ce468110fe070c766260770bb4d669a2 (patch) | |
| tree | e40c22468a475c935bbde60faee0b126aab43845 | |
| parent | e9fcab0981e343183345e90ab2c8a86e1b192b49 (diff) | |
[feature] new config option for tokens auth file
-- Related: #8867
| -rw-r--r-- | src/leap/soledad/server/_config.py | 1 | ||||
| -rw-r--r-- | testing/test_soledad/fixture_soledad.conf | 1 | ||||
| -rw-r--r-- | testing/tests/server/test_config.py | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/src/leap/soledad/server/_config.py b/src/leap/soledad/server/_config.py index 147612fb..3f3d7640 100644 --- a/src/leap/soledad/server/_config.py +++ b/src/leap/soledad/server/_config.py @@ -31,6 +31,7 @@ CONFIG_DEFAULTS = { 'batching': True, 'blobs': False, 'blobs_path': '/srv/leap/soledad/blobs', + 'services_tokens_file': '/dev/null', }, 'database-security': { 'members': ['soledad'], diff --git a/testing/test_soledad/fixture_soledad.conf b/testing/test_soledad/fixture_soledad.conf index 16fd0f4f..b36774a0 100644 --- a/testing/test_soledad/fixture_soledad.conf +++ b/testing/test_soledad/fixture_soledad.conf @@ -2,6 +2,7 @@ couch_url = http://soledad:passwd@localhost:5984 create_cmd = sudo -u soledad-admin /usr/bin/soledad-create-userdb admin_netrc = /etc/couchdb/couchdb-soledad-admin.netrc +services_tokens_file = /srv/leap/soledad/auth.tokens batching = 0 [database-security] diff --git a/testing/tests/server/test_config.py b/testing/tests/server/test_config.py index fc138f0f..874682fd 100644 --- a/testing/tests/server/test_config.py +++ b/testing/tests/server/test_config.py @@ -65,5 +65,6 @@ class ConfigurationParsingTest(unittest.TestCase): '/etc/couchdb/couchdb-soledad-admin.netrc', 'batching': False, 'blobs': False, + 'services_tokens_file': '/srv/leap/soledad/auth.tokens', 'blobs_path': '/srv/leap/soledad/blobs'} self.assertDictEqual(expected, config['soledad-server']) |