new tower/sector UI, mapping features, and network monitoring, #37802

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

diff --git a/init.d/freeside-init b/init.d/freeside-init
index 705afc1..a7bb3d1 100644 (file)
--- a/init.d/freeside-init
+++ b/init.d/freeside-init
@@ -78,6 +78,10 @@ case "$1" in
         freeside-cdrrated $QUEUED_USER
         echo "done."
 
+        echo -n "Starting freeside-pingd: "
+        freeside-pingd $QUEUED_USER
+        echo "done."
+
         if [ -e /usr/local/bin/torrus ]; then
           echo -n "Starting torrus collector: "
           /usr/local/bin/torrus collector --tree=main
@@ -88,9 +92,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)
@@ -132,6 +138,12 @@ case "$1" in
           echo "done."
         fi
 
+        if [ -e /var/run/freeside-pingd.pid ]; then
+          echo -n "Stopping freeside-pingd: "
+          kill `cat /var/run/freeside-pingd.pid`
+          echo "done."
+        fi
+
         if [ -e /var/run/freeside/torrus-srvderive.pid ]; then
           echo -n "Stopping freeside-torrus-srvderive: "
           kill `cat /var/run/freeside/torrus-srvderive.pid`
@@ -170,10 +182,10 @@ case "$1" in
           if [ -e /var/run/freeside-selfservice-server.$SELFSERVICE_USER.$MACHINE.pid ]
           then
             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 '.'
-              kill `cat /var/run/freeside-selfservice-server.$SELFSERVICE_USER.$MACHINE.pid`
               sleep 1
               howlong=$(( $howlong - 1 ))
               if [ $howlong -eq 0 ]; then