From 9f4739c4ce468110fe070c766260770bb4d669a2 Mon Sep 17 00:00:00 2001
From: Victor Shyba <victor1984@riseup.net>
Date: Tue, 22 Aug 2017 05:22:33 -0300
Subject: [feature] new config option for tokens auth file

-- Related: #8867
---
 src/leap/soledad/server/_config.py        | 1 +
 testing/test_soledad/fixture_soledad.conf | 1 +
 testing/tests/server/test_config.py       | 1 +
 3 files changed, 3 insertions(+)

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'])
-- 
cgit v1.2.3