BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updates to bbb-conf to start/stop meteor (bbb-html5 server)

Browse Source
This commit is contained in:
Fred Dixon 2015-03-12 19:41:26 -04:00
parent a77f741daf
commit 834662aef1
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
bigbluebutton-config/bin/bbb-conf
View File

@ -48,8 +48,9 @@
# 2013-11-07 FFD Finished 0.81 # 2013-11-07 FFD Finished 0.81
# 2014-01-13 FFD Working on updates for 0.9.0 # 2014-01-13 FFD Working on updates for 0.9.0
# 2014-03-10 GUG Enable Webrtc # 2014-03-10 GUG Enable Webrtc
# 2015-03-12 FFD Assed start/stop of HTML5 server
#set -x set -x
#set -e #set -e
PATH=$PATH:/sbin PATH=$PATH:/sbin
@ -235,6 +236,10 @@ uncomment () {
stop_bigbluebutton () { stop_bigbluebutton () {
/etc/init.d/monit stop /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/bbb-red5 stop
/etc/init.d/${SERVLET_CONTAINER} stop /etc/init.d/${SERVLET_CONTAINER} stop
/etc/init.d/nginx 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 "Note: monit will automatically start bbb-record-core and LibreOffice within 60 seconds."
echo 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. # At this point the red5 and servlet container applications are starting up.
# #
@ -296,13 +315,11 @@ start_bigbluebutton () {
sleep 2 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 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" echo "Startup unsuccessful: could not connect to http://$BBB_WEB/bigbluebutton/api"
exit 1 exit 1
fi fi
echo " done" echo " done"
} }