summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-06-06 11:09:13 -0400
committerMicah Anderson <micah@riseup.net>2013-06-06 11:09:13 -0400
commit781fc78dcbabb41bcd7642d30be92a9d6f6d648b (patch)
tree3214524affb5ea592350c7641b4b56b1d9429827
parente37b5fcf938e0b87a6b2f01363a453b5824d0391 (diff)
initscript: replace environment variables with more standard upper-cased names
-rw-r--r--pkg/soledad34
1 files changed, 17 insertions, 17 deletions
diff --git a/pkg/soledad b/pkg/soledad
index 2e94c339..3cfcce5b 100644
--- a/pkg/soledad
+++ b/pkg/soledad
@@ -3,14 +3,14 @@
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
-plain_port=65534
-cert_path=/etc/leap/soledad-server.pem
-privkey_path=/etc/leap/soledad-server.pem
+PIDFILE=/var/run/soledad.pid
+RUNDIR=/var/lib/soledad/
+OBJ=leap.soledad.server.application
+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
[ -r /etc/default/soledad ] && . /etc/default/soledad
@@ -24,21 +24,21 @@ case "$1" in
echo -n "Starting soledad: twistd"
HOME="/var/lib/soledad/" \
start-stop-daemon --start --quiet --exec /usr/local/bin/twistd -- \
- --pidfile=$pidfile \
- --logfile=$logfile \
+ --pidfile=$PIDFILE \
+ --logfile=$LOGFILE \
web \
- --wsgi=$obj \
- --https=$https_port \
- --certificate=$cert_path \
- --privkey=$privkey_path \
- --port=$plain_port
+ --wsgi=$OBJ \
+ --https=$HTTPS_PORT \
+ --certificate=$CERT_PATH \
+ --privkey=$PRIVKEY_PATH \
+ --port=$PLAIN_PORT
echo "."
;;
stop)
echo -n "Stopping soledad: twistd"
start-stop-daemon --stop --quiet \
- --pidfile $pidfile
+ --pidfile $PIDFILE
echo "."
;;
@@ -52,7 +52,7 @@ case "$1" in
;;
status)
- status_of_proc -p $pidfile /usr/local/bin/twistd soledad && exit 0 || exit $?
+ status_of_proc -p $PIDFILE /usr/local/bin/twistd soledad && exit 0 || exit $?
;;
*)