Clean up init.d script, fix dependencies and indentation.

This commit is contained in:
Petter Reinholdtsen 2013-09-05 23:39:38 +02:00
parent f5cd610535
commit 2f702d4736

View File

@ -1,13 +1,14 @@
#!/bin/bash #!/bin/bash
### BEGIN INIT INFO ### BEGIN INIT INFO
# Provides: plinth # Provides: plinth
# Required-Start: $syslog # Required-Start: $network $remote_fs $syslog
# Required-Stop: $syslog # Required-Stop: $remote_fs $syslog
# Default-Start: 2 3 4 5 # Default-Start: 2 3 4 5
# Default-Stop: 0 1 6 # Default-Stop: 0 1 6
# Short-Description: plinth web frontend # Short-Description: plinth web frontend
# Description: # Description:
# # Control the exmachina privileged execution daemon and the plinth
# web frontend.
### END INIT INFO ### END INIT INFO
# This file is /etc/init.d/plinth # This file is /etc/init.d/plinth
@ -28,12 +29,12 @@ set -e
start_plinth (){ start_plinth (){
if [ -f $PID_FILE ]; then if [ -f $PID_FILE ]; then
echo Already running with a pid of `cat $PID_FILE`. echo Already running with a pid of `cat $PID_FILE`.
else else
if [ -f $EXMACHINA_PID_FILE ]; then if [ -f $EXMACHINA_PID_FILE ]; then
echo exmachina was already running with a pid of `cat $EXMACHINA_PID_FILE`. echo exmachina was already running with a pid of `cat $EXMACHINA_PID_FILE`.
kill -15 `cat $EXMACHINA_PID_FILE` kill -15 `cat $EXMACHINA_PID_FILE`
rm -rf $EXMACHINA_PID_FILE rm -rf $EXMACHINA_PID_FILE
fi fi
SHAREDKEY=`$EXMACHINA_DAEMON --random-key` SHAREDKEY=`$EXMACHINA_DAEMON --random-key`
touch $PID_FILE touch $PID_FILE
@ -48,14 +49,14 @@ stop_plinth () {
if [ -f $PID_FILE ]; then if [ -f $PID_FILE ]; then
kill -15 `cat $PID_FILE` || true kill -15 `cat $PID_FILE` || true
rm -rf $PID_FILE rm -rf $PID_FILE
echo "killed plinth" echo "killed plinth"
else else
echo "No pid file at $PID_FILE suggests plinth is not running." echo "No pid file at $PID_FILE suggests plinth is not running."
fi fi
if [ -f $EXMACHINA_PID_FILE ]; then if [ -f $EXMACHINA_PID_FILE ]; then
kill -15 `cat $EXMACHINA_PID_FILE` || true kill -15 `cat $EXMACHINA_PID_FILE` || true
rm -rf $EXMACHINA_PID_FILE rm -rf $EXMACHINA_PID_FILE
echo "killed exmachina" echo "killed exmachina"
else else
echo "No pid file at $EXMACHINA_PID_FILE suggests exmachina is not running." echo "No pid file at $EXMACHINA_PID_FILE suggests exmachina is not running."
fi fi
@ -71,16 +72,15 @@ case "$1" in
echo "Stoping Plinth." echo "Stoping Plinth."
stop_plinth stop_plinth
;; ;;
restart) restart|force-reload)
$0 stop $0 stop
$0 start $0 start
;; ;;
status) status)
status_of_proc -p $PID_FILE "$DAEMON" plinth && exit 0 || exit $? status_of_proc -p $PID_FILE "$DAEMON" plinth && exit 0 || exit $?
;; ;;
*) *)
echo "Usage: $NAME {start|stop|restart|status}" >&2 echo "Usage: $NAME {start|stop|restart|force-reload|status}" >&2
exit 1 exit 1
;; ;;
esac esac