summaryrefslogtreecommitdiff
path: root/soledad_server
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-07-24 11:25:09 -0300
committerTomás Touceda <chiiph@leap.se>2013-07-24 11:25:09 -0300
commit4e1aad7501b66996720263aec164a2c3a1ef2dff (patch)
tree93dc06e351a9fc8245445e0cb605f755eb6b4d30 /soledad_server
parentfb357b3001b14af1f74a599243e9b6a6b31850ff (diff)
parent0e943d4033f79a4acfb764effd89b08899efeea2 (diff)
Merge remote-tracking branch 'micah/bug/3174' into develop
Diffstat (limited to 'soledad_server')
-rw-r--r--soledad_server/changes/fix_privkey2
-rw-r--r--soledad_server/pkg/soledad2
2 files changed, 3 insertions, 1 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/