Skip to content

Commit

Permalink
Added support for client system check in bbb-conf
Browse files Browse the repository at this point in the history
bbb-conf now
  - prints out the host in /var/www/bigbluebutton/check/config.xml
  - updates above config.xml with sudo bbb-conf --setip
  • Loading branch information
ffdixon committed Nov 12, 2014
1 parent cc35627 commit 2f238d0
Showing 1 changed file with 23 additions and 0 deletions.
23 changes: 23 additions & 0 deletions bigbluebutton-config/bin/bbb-conf
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -1123,6 +1123,16 @@ check_state() {
echo
fi

if [ -f /var/www/bigbluebutton/check/conf/config.xml ]; then
CHECK_HOST=$(cat /var/www/bigbluebutton/check/conf/config.xml | grep "<uri>rtmp" | head -1 | sed 's/.*rtmp:\/\///g' | sed 's/\/.*//g' | tr -d '\015')
echo "# Warning: The client self check is installed and accessible from:"
echo "#"
echo "# http://$CHECK_HOST/check"
echo "#"
echo

fi

if [ -f ${SERVLET_DIR}/lti/WEB-INF/classes/lti.properties ]; then
LTI_URL='http://'$(cat ${SERVLET_DIR}/lti/WEB-INF/classes/lti.properties | sed -n '/^ltiEndPoint/{s/^.*=//;p}')'/lti/tool'
echo "# Warning: The IMS Learning Tools Integration (LTI) is accessible from:"
Expand Down Expand Up @@ -1234,6 +1244,13 @@ if [ $CHECK ]; then
echo " api url: $LTI_URL"
fi

if [ -f /var/www/bigbluebutton/check/conf/config.xml ]; then
CHECK_URL=$(cat /var/www/bigbluebutton/check/conf/config.xml | grep "<uri>rtmp" | head -1 | sed 's/.*rtmp:\/\///g' | sed 's/\/.*//g' | tr -d '\015')
echo
echo "/var/www/bigbluebutton/check/conf/config.xml (client check)"
echo " client check: $CHECK_URL"
fi

CONFERENCING_MODULE="FreeSWITCH"

echo
Expand Down Expand Up @@ -1473,6 +1490,12 @@ if [ -n "$HOST" ]; then
done
echo

if [ -f /var/www/bigbluebutton/check/conf/config.xml ]; then
echo "Assigning $HOST for client self check to /var/www/bigbluebutton/check/conf/config.xml"
sed -i "s/rtmp:\/\/\([^\"\/]*\)\//rtmp:\/\/$HOST\//g" /var/www/bigbluebutton/check/conf/config.xml
sed -i "s/rtmpt:\/\/\([^\"\/]*\)\//rtmpt:\/\/$HOST\//g" /var/www/bigbluebutton/check/conf/config.xml
fi

echo "Restarting the bigbluebutton server ..."
stop_bigbluebutton
echo
Expand Down

0 comments on commit 2f238d0

Please sign in to comment.