X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=init.d%2Ffreeside-init;h=56733bdc6916bef32d97b7ba5720e1a7a09c3cf7;hp=46f133d59c92b931ac48f1421d350e338c520fa1;hb=673b9a458d9138523026963df6fa3b4683e09bae;hpb=f221fec654d6d125d3ccb5aed5dce9f11fe8b99b

diff --git a/init.d/freeside-init b/init.d/freeside-init
index 46f133d59..56733bdc6 100644
--- a/init.d/freeside-init
+++ b/init.d/freeside-init
@@ -3,17 +3,14 @@
 # chkconfig: 345 86 16
 # description: Freeside daemons
 
-QUEUED_USER=ivan
+QUEUED_USER=%%%QUEUED_USER%%%
 
-FREESIDE_PATH="/home/ivan/freeside_current"
+SELFSERVICE_USER=%%%SELFSERVICE_USER%%%
+SELFSERVICE_MACHINES="%%%SELFSERVICE_MACHINES%%%"
 
-PASSWD_USER=ivan
-PASSWD_MACHINE=localhost
-
-SIGNUP_USER=ivan
-SIGNUP_MACHINE=localhost
-SIGNUP_AGENTNUM=2
-SIGNUP_REFNUM=2
+#INSTALLSCRIPT/INSTALLSITEBIN from Makefile.PL
+PATH="$PATH:/usr/local/bin"
+export PATH
 
 case "$1" in
   start)
@@ -22,13 +19,20 @@ case "$1" in
         freeside-queued $QUEUED_USER
         echo "done."
 
-        echo -n "Starting fs_passwd_server: "
-        su freeside -c "$FREESIDE_PATH/fs_passwd/fs_passwd_server $PASSWD_USER $PASSWD_MACHINE" &
-        echo "done."
+        #echo -n "Starting freeside-sqlradius-radacctd: "
+        #freeside-sqlradius-radacctd $QUEUED_USER
+        #echo "done."
 
-        echo -n "Starting fs_signup_server: "
-        su freeside -c "$FREESIDE_PATH/fs_signup/fs_signup_server $SIGNUP_USER $SIGNUP_MACHINE $SIGNUP_AGENTNUM $SIGNUP_REFNUM" &
+        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
+          echo "done."
+        done
+
         ;;
   stop)
         # Stop daemons.
@@ -36,13 +40,27 @@ case "$1" in
         kill `cat /var/run/freeside-queued.pid`
         echo "done."
 
-        echo -n "Stopping fs_passwd_server: "
-        killall fs_passwd_server
+        echo -n "Stopping freeside-sqlradius-radacctd: "
+        kill `cat /var/run/freeside-sqlradius-radacctd.pid`
         echo "done."
 
-        echo -n "Stopping fs_signup_server: "
-        killall fs_signup_server
+        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: "
+          kill `cat /var/run/freeside-selfservice-server.$SELFSERVICE_USER.pid`
+          rm /var/run/freeside-selfservice-server.$SELFSERVICE_USER.pid
+        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."
+        done
+
         ;;
 
   restart)