From ee69f207716251ab7cbb6e95d06b7be8555165f6 Mon Sep 17 00:00:00 2001
From: drebs <drebs@riseup.net>
Date: Wed, 13 Sep 2017 12:31:17 -0300
Subject: [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
---
 debian/soledad-server.dirs          | 1 +
 src/leap/soledad/server/_config.py  | 2 +-
 testing/tests/server/test_config.py | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 debian/soledad-server.dirs

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