diff options
| author | drebs <drebs@riseup.net> | 2017-09-13 12:38:26 -0300 |
|---|---|---|
| committer | drebs <drebs@riseup.net> | 2017-09-14 12:04:56 -0300 |
| commit | ddb830fdfe767efe1dd8e4e27281531938211203 (patch) | |
| tree | 36ca17bfa8724bc3c830c4b25f2db04d8d88119d | |
| parent | ee69f207716251ab7cbb6e95d06b7be8555165f6 (diff) | |
[pkg] standardize location of services tokens file
Introduction of local services authentication added a configuration file
containing the auth tokens for each service. There were different names
for that file, and this commit standardizes all of them to the same
value: /etc/soledad/services.tokens
| -rw-r--r-- | src/leap/soledad/server/_config.py | 2 | ||||
| -rw-r--r-- | testing/test_soledad/fixture_soledad.conf | 2 | ||||
| -rw-r--r-- | testing/tests/server/test_config.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/leap/soledad/server/_config.py b/src/leap/soledad/server/_config.py index 7cae1e49..c23f1eae 100644 --- a/src/leap/soledad/server/_config.py +++ b/src/leap/soledad/server/_config.py @@ -32,7 +32,7 @@ CONFIG_DEFAULTS = { 'batching': True, 'blobs': False, 'blobs_path': '/var/lib/soledad/blobs', - 'services_tokens_file': '/etc/soledad/incoming.tokens', + 'services_tokens_file': '/etc/soledad/services.tokens', }, 'database-security': { 'members': ['soledad'], diff --git a/testing/test_soledad/fixture_soledad.conf b/testing/test_soledad/fixture_soledad.conf index b36774a0..80e7a4d4 100644 --- a/testing/test_soledad/fixture_soledad.conf +++ b/testing/test_soledad/fixture_soledad.conf @@ -2,7 +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 +services_tokens_file = /etc/soledad/services.tokens batching = 0 [database-security] diff --git a/testing/tests/server/test_config.py b/testing/tests/server/test_config.py index 2176832f..dfb09f4c 100644 --- a/testing/tests/server/test_config.py +++ b/testing/tests/server/test_config.py @@ -65,6 +65,6 @@ class ConfigurationParsingTest(unittest.TestCase): '/etc/couchdb/couchdb-soledad-admin.netrc', 'batching': False, 'blobs': False, - 'services_tokens_file': '/srv/leap/soledad/auth.tokens', + 'services_tokens_file': '/etc/soledad/services.tokens', 'blobs_path': '/var/lib/soledad/blobs'} self.assertDictEqual(expected, config['soledad-server']) |