summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/leap/soledad/server/_config.py2
-rw-r--r--testing/test_soledad/fixture_soledad.conf2
-rw-r--r--testing/tests/server/test_config.py2
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'])