X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=init.d%2Ffreeside-init;h=9d8530739f932556758b2ef303b11b83334092d0;hp=c82ea98621d496cedeaceddb8a34c6f5fe207a2f;hb=5b73387992a96f7b80e40b5ecb2fedabd8a78d6b;hpb=dfb7a6fac8234f53ba8b1719bfa29ecf474f4241

diff --git a/init.d/freeside-init b/init.d/freeside-init
index c82ea9862..9d8530739 100644
--- a/init.d/freeside-init
+++ b/init.d/freeside-init
@@ -2,6 +2,18 @@
 #
 # chkconfig: 345 86 16
 # description: Freeside daemons
+#
+### BEGIN INIT INFO
+# Provides:          freeside
+# Required-Start:    $time $remote_fs
+# Required-Stop:     $remote_fs
+# Should-Start:      postgresql mysql
+# Should-Stop:       postgresql mysql
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start Freeside daemons at boot time
+# Description:       Enable Freeside daemons
+### END INIT INFO
 
 QUEUED_USER=%%%QUEUED_USER%%%
 
@@ -42,6 +54,10 @@ case "$1" in
         freeside-cdrd $QUEUED_USER
         echo "done."
 
+        echo -n "Starting freeside-cdrrated: "
+        freeside-cdrrated $QUEUED_USER
+        echo "done."
+
         for MACHINE in $SELFSERVICE_MACHINES; do
           echo -n "Starting freeside-selfservice-server to $MACHINE: "
           freeside-selfservice-server $SELFSERVICE_USER $MACHINE
@@ -52,6 +68,12 @@ case "$1" in
         freeside-selfservice-xmlrpcd $SELFSERVICE_USER
         echo "done."
 
+        if [ -e /usr/local/bin/torrus ]; then
+          echo -n "Starting torrus collector: "
+          /usr/local/bin/torrus collector --tree=main
+          echo "done."
+        fi
+
         echo -n "Starting freeside-torrus-srvderive: "
         freeside-torrus-srvderive $QUEUED_USER
         echo "done."
@@ -94,6 +116,12 @@ case "$1" in
           echo "done."
         fi
 
+        if [ -e /var/run/freeside-cdrrated.pid ]; then
+          echo -n "Stopping freeside-cdrrated: "
+          kill `cat /var/run/freeside-cdrrated.pid`
+          echo "done."
+        fi
+
         if [ -e /var/run/freeside-selfservice-server.$SELFSERVICE_USER.pid ]
         then
           echo -n "Stopping (old) freeside-selfservice-server: "
@@ -124,6 +152,12 @@ case "$1" in
           echo "done."
         fi
 
+        if [ -e /var/run/torrus/collector.main_?.pid ]; then
+          echo -n "Stopping torrus collector: "
+          kill `cat /var/run/torrus/collector.main_?.pid`
+          echo "done."
+        fi
+
         ;;
 
   restart)