From 834662aef13662ee4ac742258de98a1b95fb85e1 Mon Sep 17 00:00:00 2001 From: Fred Dixon Date: Thu, 12 Mar 2015 19:41:26 -0400 Subject: [PATCH] Updates to bbb-conf to start/stop meteor (bbb-html5 server) --- bigbluebutton-config/bin/bbb-conf | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/bigbluebutton-config/bin/bbb-conf b/bigbluebutton-config/bin/bbb-conf index e3476e2176..ba7a46377e 100644 --- a/bigbluebutton-config/bin/bbb-conf +++ b/bigbluebutton-config/bin/bbb-conf @@ -48,8 +48,9 @@ # 2013-11-07 FFD Finished 0.81 # 2014-01-13 FFD Working on updates for 0.9.0 # 2014-03-10 GUG Enable Webrtc +# 2015-03-12 FFD Assed start/stop of HTML5 server -#set -x +set -x #set -e PATH=$PATH:/sbin @@ -235,6 +236,10 @@ uncomment () { stop_bigbluebutton () { /etc/init.d/monit stop + if [ -f /etc/init/bbb-html5 ]; then + stop bbb-html5 + fi + /etc/init.d/bbb-red5 stop /etc/init.d/${SERVLET_CONTAINER} stop /etc/init.d/nginx stop @@ -279,6 +284,20 @@ start_bigbluebutton () { echo "Note: monit will automatically start bbb-record-core and LibreOffice within 60 seconds." echo + BBB_WEB=$(cat ${SERVLET_DIR}/bigbluebutton/WEB-INF/classes/bigbluebutton.properties | sed -n '/^bigbluebutton.web.serverURL/{s/.*\///;p}') + if [ -f /etc/init/bbb-html5 ]; then + echo -n "Waiting for Meteor (HTML5 server) to finish starting up (this may take a minute): " + start bbb-html5 + + if ! wget -q -O - http://10.0.3.96/html5client/check | grep __meteor-css__ > /dev/null; then + while ! wget -q -O - http://10.0.3.96/html5client/check | grep __meteor-css__ > /dev/null; do + echo -n "." + sleep 1 + done + fi + fi + + # # At this point the red5 and servlet container applications are starting up. # @@ -296,13 +315,11 @@ start_bigbluebutton () { sleep 2 - BBB_WEB=$(cat ${SERVLET_DIR}/bigbluebutton/WEB-INF/classes/bigbluebutton.properties | sed -n '/^bigbluebutton.web.serverURL/{s/.*\///;p}') if ! wget http://$BBB_WEB/bigbluebutton/api -O - --quiet | grep -q SUCCESS; then echo "Startup unsuccessful: could not connect to http://$BBB_WEB/bigbluebutton/api" exit 1 fi - echo " done" }