summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrebs <drebs@riseup.net>2017-09-13 12:31:17 -0300
committerdrebs <drebs@riseup.net>2017-09-14 12:04:56 -0300
commitee69f207716251ab7cbb6e95d06b7be8555165f6 (patch)
tree36b0c3ff6ac8653c4363a57fbb6a2ce824d912dd
parentc95f26dbb9315b94cf74747fa9c071b89331dd06 (diff)
[pkg] use /var/lib/soledad/blobs to store blobs
Soledad Server was previously using something in /srv to store blobs in the server side. Debian/lintian doesn't like that at all, so we are changing to /var/lib/soledad/blobs. Closes: #8948
-rw-r--r--debian/soledad-server.dirs1
-rw-r--r--src/leap/soledad/server/_config.py2
-rw-r--r--testing/tests/server/test_config.py2
3 files changed, 3 insertions, 2 deletions
diff --git a/debian/soledad-server.dirs b/debian/soledad-server.dirs
new file mode 100644
index 00000000..0819eebb
--- /dev/null
+++ b/debian/soledad-server.dirs
@@ -0,0 +1 @@
+var/lib/soledad/blobs
diff --git a/src/leap/soledad/server/_config.py b/src/leap/soledad/server/_config.py
index 3745d628..7cae1e49 100644
--- a/src/leap/soledad/server/_config.py
+++ b/src/leap/soledad/server/_config.py
@@ -31,7 +31,7 @@ CONFIG_DEFAULTS = {
'admin_netrc': '/etc/couchdb/couchdb-admin.netrc',
'batching': True,
'blobs': False,
- 'blobs_path': '/srv/leap/soledad/blobs',
+ 'blobs_path': '/var/lib/soledad/blobs',
'services_tokens_file': '/etc/soledad/incoming.tokens',
},
'database-security': {
diff --git a/testing/tests/server/test_config.py b/testing/tests/server/test_config.py
index 874682fd..2176832f 100644
--- a/testing/tests/server/test_config.py
+++ b/testing/tests/server/test_config.py
@@ -66,5 +66,5 @@ class ConfigurationParsingTest(unittest.TestCase):
'batching': False,
'blobs': False,
'services_tokens_file': '/srv/leap/soledad/auth.tokens',
- 'blobs_path': '/srv/leap/soledad/blobs'}
+ 'blobs_path': '/var/lib/soledad/blobs'}
self.assertDictEqual(expected, config['soledad-server'])