$field is not a global.

[freeside.git] / init.d / freeside-init

diff --git a/init.d/freeside-init b/init.d/freeside-init
index d3016b2..b9c95ae 100644 (file)
--- a/init.d/freeside-init
+++ b/init.d/freeside-init
@@ -7,13 +7,8 @@ QUEUED_USER=%%%QUEUED_USER%%%
 
 FREESIDE_PATH="%%%FREESIDE_PATH%%%"
 
-PASSWD_USER=%%%PASSWD_USER%%%
-PASSWD_MACHINE=%%%PASSWD_MACHINE%%%
-
-SIGNUP_USER=%%%SIGNUP_USER%%%
-SIGNUP_MACHINE=%%%SIGNUP_MACHINE%%%
-SIGNUP_AGENTNUM=%%%SIGNUP_AGENTNUM%%%
-SIGNUP_REFNUM=%%%SIGNUP_REFNUM%%%
+SELFSERVICE_USER=%%%SELFSERVICE_USER%%%
+SELFSERVICE_MACHINE=%%%SELFSERVICE_MACHINE%%%
 
 case "$1" in
   start)
@@ -22,13 +17,10 @@ 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 -n "Starting freeside-selfservice-server: "
+        freeside-selfservice-server $SELFSERVICE_USER $SELFSERVICE_MACHINE
         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 "done."
         ;;
   stop)
         # Stop daemons.
@@ -36,12 +28,8 @@ case "$1" in
         kill `cat /var/run/freeside-queued.pid`
         echo "done."
 
-        echo -n "Stopping fs_passwd_server: "
-        killall fs_passwd_server
-        echo "done."
-
-        echo -n "Stopping fs_signup_server: "
-        killall fs_signup_server
+        echo -n "Stopping freeside-selfservice-server: "
+        kill `cat /var/run/freeside-selfservice-server.$SELFSERVICE_USER.pid`
         echo "done."
         ;;