diff options
| author | Kali Kaneko <kali@leap.se> | 2016-04-25 21:08:11 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2016-04-25 21:08:11 -0400 |
| commit | f660630ac6676dd31d4984f4df9e9110b548b746 (patch) | |
| tree | 9f2be4650d852ea16b2fd3bfd108e5c376bfacbb /server/pkg/soledad-server | |
| parent | 40e32be29d9b02e03da4f007fb4f68f3e3709c01 (diff) | |
| parent | d5974f61df6ca640dde69903976d4721b6d88007 (diff) | |
Merge tag '0.8.0' into debian/experimental
Tag soledad version 0.8.0
Diffstat (limited to 'server/pkg/soledad-server')
| -rw-r--r-- | server/pkg/soledad-server | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/server/pkg/soledad-server b/server/pkg/soledad-server index d127c5c5..da00e06b 100644 --- a/server/pkg/soledad-server +++ b/server/pkg/soledad-server @@ -11,12 +11,12 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin PIDFILE=/var/run/soledad.pid -RUNDIR=/var/lib/soledad/ OBJ=leap.soledad.server.application LOGFILE=/var/log/soledad.log HTTPS_PORT=2424 -CERT_PATH=/etc/leap/soledad-server.pem -PRIVKEY_PATH=/etc/leap/soledad-server.key +CONFDIR=/etc/soledad +CERT_PATH="${CONFDIR}/soledad-server.pem" +PRIVKEY_PATH="${CONFDIR}/soledad-server.key" TWISTD_PATH=/usr/bin/twistd HOME=/var/lib/soledad/ SSL_METHOD=SSLv23_METHOD @@ -25,7 +25,7 @@ GROUP=soledad [ -r /etc/default/soledad ] && . /etc/default/soledad -test -r /etc/leap/ || exit 0 +test -r ${CONFDIR} || exit 0 . /lib/lsb/init-functions |