diff options
author | Micah Anderson <micah@riseup.net> | 2013-07-15 11:41:03 +0100 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2013-07-20 09:20:59 -0400 |
commit | 0e943d4033f79a4acfb764effd89b08899efeea2 (patch) | |
tree | 93dc06e351a9fc8245445e0cb605f755eb6b4d30 | |
parent | fb357b3001b14af1f74a599243e9b6a6b31850ff (diff) |
Change initscript PRIVKEY_PATH to not also point to the certificate, instead pointing to an explicit .key file
-rw-r--r-- | soledad_server/changes/fix_privkey | 2 | ||||
-rw-r--r-- | soledad_server/pkg/soledad | 2 |
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/ |