summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG6
-rw-r--r--soledad/changes/feature_3080-add-method-for-password-change1
-rw-r--r--soledad/setup.py2
-rw-r--r--soledad_server/changes/fix_privkey2
-rw-r--r--soledad_server/pkg/soledad2
-rw-r--r--soledad_server/setup.py2
6 files changed, 11 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 72229567..93ce5071 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+0.2.2 Jul 12:
+Client:
+ o Add method for password change.
+Server:
+ o Use the right name as the WSGI server
+
0.2.1 Jun 28:
Client:
o Do not list the backends in the __init__'s __all__ to allow not
diff --git a/soledad/changes/feature_3080-add-method-for-password-change b/soledad/changes/feature_3080-add-method-for-password-change
deleted file mode 100644
index 0158ad00..00000000
--- a/soledad/changes/feature_3080-add-method-for-password-change
+++ /dev/null
@@ -1 +0,0 @@
- o Add method for password change.
diff --git a/soledad/setup.py b/soledad/setup.py
index cda7f9f7..747b02bd 100644
--- a/soledad/setup.py
+++ b/soledad/setup.py
@@ -62,7 +62,7 @@ trove_classifiers = (
setup(
name='leap.soledad',
- version='0.2.1',
+ version='0.2.2',
url='https://leap.se/',
license='GPLv3+',
description='Synchronization of locally encrypted data among devices.',
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.',