X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=init.d%2Ffreeside-init;h=ddee5d2d7497b14826a93f8ae80f84b821b113d9;hb=9c236c52118ead925e960571f0532fa064fd81bf;hp=95598e9ba9ce5c517bab686aade43223149ac374;hpb=beba6672fb9c9c5769c81f8029bb88cd2bc910e9;p=freeside.git

diff --git a/init.d/freeside-init b/init.d/freeside-init
index 95598e9ba..ddee5d2d7 100644
--- a/init.d/freeside-init
+++ b/init.d/freeside-init
@@ -1,12 +1,10 @@
-#! /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%%%"
 
@@ -14,6 +12,8 @@ SELFSERVICE_MACHINES="%%%SELFSERVICE_MACHINES%%%"
 PATH="$PATH:/usr/local/bin"
 export PATH
 
+[ -r /etc/default/freeside ] && . /etc/default/freeside
+
 case "$1" in
   start)
         # Start daemons.
@@ -25,6 +25,10 @@ case "$1" in
         freeside-sqlradius-radacctd $QUEUED_USER
         echo "done."
 
+        echo -n "Starting freeside-prepaidd: "
+        freeside-prepaidd $QUEUED_USER
+        echo "done."
+
         for MACHINE in $SELFSERVICE_MACHINES; do
           echo -n "Starting freeside-selfservice-server to $MACHINE: "
           freeside-selfservice-server $SELFSERVICE_USER $MACHINE
@@ -38,10 +42,17 @@ case "$1" in
         kill `cat /var/run/freeside-queued.pid`
         echo "done."
 
+        #and
+        killall freeside-queued
+
         echo -n "Stopping freeside-sqlradius-radacctd: "
         kill `cat /var/run/freeside-sqlradius-radacctd.pid`
         echo "done."
 
+        echo -n "Stopping freeside-prepaidd: "
+        kill `cat /var/run/freeside-prepaidd.pid`
+        echo "done."
+
         if [ -e /var/run/freeside-selfservice-server.$SELFSERVICE_USER.pid ]
         then
           echo -n "Stopping (old) freeside-selfservice-server: "