From b3102fadf6bdf85f5ff979df35f337714021fc67 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Thu, 6 Jun 2013 11:10:29 -0400
Subject: initscript: make a TWISTD_PATH environment variable to replace
 hard-coded /usr/local/bin/twistd

---
 pkg/soledad | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkg/soledad b/pkg/soledad
index 3cfcce5b..018ae927 100644
--- a/pkg/soledad
+++ b/pkg/soledad
@@ -11,6 +11,7 @@ HTTPS_PORT=2424
 PLAIN_PORT=65534
 CERT_PATH=/etc/leap/soledad-server.pem
 PRIVKEY_PATH=/etc/leap/soledad-server.pem
+TWISTD_PATH=/usr/bin/twistd
 
 [ -r /etc/default/soledad ] && . /etc/default/soledad
 
@@ -23,7 +24,7 @@ case "$1" in
     start)
         echo -n "Starting soledad: twistd"
         HOME="/var/lib/soledad/" \
-          start-stop-daemon --start --quiet --exec /usr/local/bin/twistd -- \
+          start-stop-daemon --start --quiet --exec $TWISTD_PATH -- \
                           --pidfile=$PIDFILE \
                           --logfile=$LOGFILE \
                           web \
@@ -52,7 +53,7 @@ case "$1" in
     ;;
 
     status)
-        status_of_proc -p $PIDFILE /usr/local/bin/twistd soledad && exit 0 || exit $?
+        status_of_proc -p $PIDFILE $TWISTD_PATH soledad && exit 0 || exit $?
     ;;
 
     *)
-- 
cgit v1.2.3