X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=init.d%2Ffreeside-init;h=248c5b36e2fd3cc8eedd8a81a334ce51ca53f6c6;hb=4f3d9e2ef5ce5305363ae426b87ed2b873b355d8;hp=92e3fdfe060c19810f2daf57b4cbc2a10731cf72;hpb=e9e0cf0989259b94d9758eceff448666a2e5a5cc;p=freeside.git

diff --git a/init.d/freeside-init b/init.d/freeside-init
index 92e3fdfe0..248c5b36e 100644
--- a/init.d/freeside-init
+++ b/init.d/freeside-init
@@ -88,9 +88,11 @@ case "$1" in
         freeside-torrus-srvderive $QUEUED_USER
         echo "done."
 
-        #ip=`/sbin/ifconfig $IF | grep 'inet addr:' | cut -d: -f2- | cut -d' ' -f1`
-        #cp /opt/rt3/etc/RT_SiteConfig.pm.ORIG /opt/rt3/etc/RT_SiteConfig.pm
-        #perl -pi -e "s/localhost/$ip/" /opt/rt3/etc/RT_SiteConfig.pm
+        if [ -e /opt/rt3/etc/RT_SiteConfig.pm.ORIG_WEBDEMO_HACK ]; then
+          ip=`/sbin/ifconfig $IF | grep 'inet addr:' | cut -d: -f2- | cut -d' ' -f1`
+          cp /opt/rt3/etc/RT_SiteConfig.pm.ORIG_WEBDEMO_HACK /opt/rt3/etc/RT_SiteConfig.pm
+          perl -pi -e "s/localhost/$ip/" /opt/rt3/etc/RT_SiteConfig.pm
+        fi
 
         ;;
   stop)
@@ -160,6 +162,7 @@ case "$1" in
         then
           echo -n "Stopping (old) freeside-selfservice-server: "
           kill `cat /var/run/freeside-selfservice-server.$SELFSERVICE_USER.pid`
+          sleep 
           rm /var/run/freeside-selfservice-server.$SELFSERVICE_USER.pid
           echo "done."
         fi
@@ -168,9 +171,20 @@ case "$1" in
         for MACHINE in $SELFSERVICE_MACHINES; do
           if [ -e /var/run/freeside-selfservice-server.$SELFSERVICE_USER.$MACHINE.pid ]
           then
-            echo -n "Stopping freeside-selfservice-server to $MACHINE: "
+            echo -n "Stopping freeside-selfservice-server to $MACHINE"
             kill `cat /var/run/freeside-selfservice-server.$SELFSERVICE_USER.$MACHINE.pid`
+            howlong=10
+            while [ $howlong -gt 0 ] && kill -0 `cat /var/run/freeside-selfservice-server.$SELFSERVICE_USER.$MACHINE.pid` 2>/dev/null; do
+              echo -n '.'
+              sleep 1
+              howlong=$(( $howlong - 1 ))
+              if [ $howlong -eq 0 ]; then
+                echo -n 'forcefully.'
+                kill -9 `cat /var/run/freeside-selfservice-server.$SELFSERVICE_USER.$MACHINE.pid`
+              fi
+            done
             echo "done."
+            rm /var/run/freeside-selfservice-server.$SELFSERVICE_USER.$MACHINE.pid
           fi
         done