summaryrefslogtreecommitdiff
path: root/soledad_server
diff options
context:
space:
mode:
Diffstat (limited to 'soledad_server')
-rw-r--r--soledad_server/changes/fix_privkey2
-rw-r--r--soledad_server/pkg/soledad2
-rw-r--r--soledad_server/setup.py2
3 files changed, 4 insertions, 2 deletions
diff --git a/soledad_server/changes/fix_privkey b/soledad_server/changes/fix_privkey
new file mode 100644
index 00000000..87bf4d54
--- /dev/null
+++ b/soledad_server/changes/fix_privkey
@@ -0,0 +1,2 @@
+Fix double specified /etc/leap/soledad-server.pem in initscript by pointing
+the PRIVKEY_PATH to /etc/leap/soledad-server.key. Fixes #3174.
diff --git a/soledad_server/pkg/soledad b/soledad_server/pkg/soledad
index b1d898cc..1254cabe 100644
--- a/soledad_server/pkg/soledad
+++ b/soledad_server/pkg/soledad
@@ -17,7 +17,7 @@ LOGFILE=/var/log/soledad.log
HTTPS_PORT=2424
PLAIN_PORT=65534
CERT_PATH=/etc/leap/soledad-server.pem
-PRIVKEY_PATH=/etc/leap/soledad-server.pem
+PRIVKEY_PATH=/etc/leap/soledad-server.key
TWISTD_PATH=/usr/bin/twistd
HOME=/var/lib/soledad/
diff --git a/soledad_server/setup.py b/soledad_server/setup.py
index 2ba56ece..f9cdd07f 100644
--- a/soledad_server/setup.py
+++ b/soledad_server/setup.py
@@ -60,7 +60,7 @@ trove_classifiers = (
setup(
name='leap.soledad_server',
- version='0.2.1',
+ version='0.2.2',
url='https://leap.se/',
license='GPLv3+',
description='Synchronization of locally encrypted data among devices.',