CC-2978: Install fails on Ubuntu 11.10

-fixed for oneiric version of rabbitmq

install_minimal/airtime-install

@@ -45,19 +45,7 @@ python $AIRTIMEROOT/python_apps/create-pypo-user.py
 $SCRIPTPATH/include/airtime-copy-files.sh
 $SCRIPTPATH/include/airtime-initialize.sh $@
 
-#Hack to parse rabbitmq pid and place it into the correct directory. This is also
-#done in our rabbitmq init.d script, but placing it here so that monit recognizes 
-# it faster (in time for the upcoming airtime-check-system)
-codename=`lsb_release -cs`
-if [ "$codename" == "oneiric" ];
-then
-    rabbitmqstatus=`/etc/init.d/rabbitmq-server status | grep "\[{pid"`
-    rabbitmqpid=`echo $rabbitmqstatus | sed "s/.*,\(.*\)\}.*/\1/"`
-else
-    rabbitmqpid=`sed "s/.*,\(.*\)\}.*/\1/" /var/lib/rabbitmq/pids`
-fi
-echo "RabbitMQ PID: $rabbitmqpid"
-echo "$rabbitmqpid" > /var/run/rabbitmq.pid
+/usr/lib/airtime/utils/rabbitmq-update-pid.sh
 
 echo -e "\n*** Verifying your system environment, running airtime-check-system ***"
 sleep 10

python_apps/monit/monit-airtime-generic.cfg

@@ -6,5 +6,5 @@
 
  check process rabbitmq-server
     with pidfile "/var/run/rabbitmq.pid"
-    start program = "/bin/bash -c '/etc/init.d/rabbitmq-server start; sed "s/.*,\(.*\)\}.*/\1/" /var/lib/rabbitmq/pids > /var/run/rabbitmq.pid'"
+    start program = "/bin/bash -c '/etc/init.d/rabbitmq-server start; /usr/lib/airtime/utils/rabbitmq-update-pid.sh'"
     stop program = "/etc/init.d/rabbitmq-server stop"

utils/rabbitmq-update-pid.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+#Hack to parse rabbitmq pid and place it into the correct directory. This is also
+#done in our rabbitmq init.d script, but placing it here so that monit recognizes 
+# it faster (in time for the upcoming airtime-check-system)
+codename=`lsb_release -cs`
+if [ "$codename" == "oneiric" ];
+then
+    rabbitmqstatus=`/etc/init.d/rabbitmq-server status | grep "\[{pid"`
+    rabbitmqpid=`echo $rabbitmqstatus | sed "s/.*,\(.*\)\}.*/\1/"`
+else
+    rabbitmqpid=`sed "s/.*,\(.*\)\}.*/\1/" /var/lib/rabbitmq/pids`
+fi
+echo "RabbitMQ PID: $rabbitmqpid"
+echo "$rabbitmqpid" > /var/run/rabbitmq.pid