diff options
| author | Kali Kaneko <kali@leap.se> | 2015-10-06 10:56:27 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2015-10-06 10:56:27 -0400 |
| commit | 9975e9b4ecc553d13a5e5b283257af9fedab51bf (patch) | |
| tree | ce360620d46ec010a5af0035eb99394c86bdf26f /server/pkg/soledad-server | |
| parent | be2a2966ec6c8d8608424cf934a9313de3cac822 (diff) | |
| parent | 16ca8e6b7514dab3d2135c2c407780761bcd10b7 (diff) | |
Merge branch 'develop' into debian/platform-0.8
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 |