X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=init.d%2Ffreeside-init;h=54ebea29784a94e54effe26ad39f4204be9ace51;hb=e95a136f9dae69525dd926ce4d3314e407a567c9;hp=1ca7dff0e1048dcd95859a9d0a9929b70b2ab70e;hpb=eb9668a6f3181ee02cb335272c5ee4616e61fd09;p=freeside.git diff --git a/init.d/freeside-init b/init.d/freeside-init index 1ca7dff0e..54ebea297 100644 --- a/init.d/freeside-init +++ b/init.d/freeside-init @@ -1,15 +1,19 @@ -#! /bin/sh +#!/bin/sh # # chkconfig: 345 86 16 # description: Freeside daemons QUEUED_USER=%%%QUEUED_USER%%% -FREESIDE_PATH="%%%FREESIDE_PATH%%%" - SELFSERVICE_USER=%%%SELFSERVICE_USER%%% SELFSERVICE_MACHINES="%%%SELFSERVICE_MACHINES%%%" +#INSTALLSCRIPT/INSTALLSITEBIN from Makefile.PL +PATH="$PATH:/usr/local/bin" +export PATH + +[ -r /etc/default/freeside ] && . /etc/default/freeside + case "$1" in start) # Start daemons. @@ -17,6 +21,18 @@ case "$1" in freeside-queued $QUEUED_USER echo "done." + echo -n "Starting freeside-sqlradius-radacctd: " + freeside-sqlradius-radacctd $QUEUED_USER + echo "done." + + echo -n "Starting freeside-prepaidd: " + freeside-prepaidd $QUEUED_USER + echo "done." + + echo -n "Starting freeside-cdrd: " + freeside-cdrd $QUEUED_USER + echo "done." + for MACHINE in $SELFSERVICE_MACHINES; do echo -n "Starting freeside-selfservice-server to $MACHINE: " freeside-selfservice-server $SELFSERVICE_USER $MACHINE @@ -27,20 +43,45 @@ case "$1" in stop) # Stop daemons. echo -n "Stopping freeside-queued: " - kill `cat /var/run/freeside-queued.pid` + [ -e /var/run/freeside-queued.pid ] && kill `cat /var/run/freeside-queued.pid` + #and + sleep 2; + killall freeside-queued echo "done." + if [ -e /var/run/freeside-sqlradius-radacctd.pid ]; then + echo -n "Stopping freeside-sqlradius-radacctd: " + kill `cat /var/run/freeside-sqlradius-radacctd.pid` + echo "done." + fi + + if [ -e /var/run/freeside-prepaidd.pid ]; then + echo -n "Stopping freeside-prepaidd: " + kill `cat /var/run/freeside-prepaidd.pid` + echo "done." + fi + + if [ -e /var/run/freeside-cdrd.pid ]; then + echo -n "Stopping freeside-cdrd: " + kill `cat /var/run/freeside-cdrd.pid` + echo "done." + fi + if [ -e /var/run/freeside-selfservice-server.$SELFSERVICE_USER.pid ] then echo -n "Stopping (old) freeside-selfservice-server: " kill `cat /var/run/freeside-selfservice-server.$SELFSERVICE_USER.pid` rm /var/run/freeside-selfservice-server.$SELFSERVICE_USER.pid + echo "done." fi for MACHINE in $SELFSERVICE_MACHINES; do - echo -n "Stopping freeside-selfservice-server to $MACHINE: " - kill `cat /var/run/freeside-selfservice-server.$SELFSERVICE_USER.$MACHINE.pid` - echo "done." + if [ -e /var/run/freeside-selfservice-server.$SELFSERVICE_USER.$MACHINE.pid ] + then + echo -n "Stopping freeside-selfservice-server to $MACHINE: " + kill `cat /var/run/freeside-selfservice-server.$SELFSERVICE_USER.$MACHINE.pid` + echo "done." + fi done ;;