X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=init.d%2Ffreeside-init;h=b9c95ae5388ba1aaec4dedd0bdae1c7de7a31b2c;hp=37ced73d4faa43679beca3ff0f570991e6245e7c;hb=c2a0b1b8e9d437434e326a3b573d7134c5697213;hpb=2f9eb7976dca75dc6c585ea9c62f1b0898e3e953

diff --git a/init.d/freeside-init b/init.d/freeside-init
index 37ced73d4..b9c95ae53 100644
--- a/init.d/freeside-init
+++ b/init.d/freeside-init
@@ -7,14 +7,6 @@ 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%%%
 
@@ -25,16 +17,8 @@ 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 fs_signup_server: "
-        su freeside -c "$FREESIDE_PATH/fs_signup/fs_signup_server $SIGNUP_USER $SIGNUP_MACHINE $SIGNUP_AGENTNUM $SIGNUP_REFNUM" &
-        echo "done."
-
         echo -n "Starting freeside-selfservice-server: "
-        $FREESIDE_PATH/fs_selfservice/freeside-selfservice-server $SELFSERVICE_USER $SELFSERVICE_MACHINE
+        freeside-selfservice-server $SELFSERVICE_USER $SELFSERVICE_MACHINE
         echo "done."
 
         ;;
@@ -44,16 +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 "done."
-
         echo -n "Stopping freeside-selfservice-server: "
-        kill `cat /var/run/freeside-selfservice-server.pid`
+        kill `cat /var/run/freeside-selfservice-server.$SELFSERVICE_USER.pid`
         echo "done."
         ;;