From b498ea0569053dc80001de2adb84f04e177dd8f2 Mon Sep 17 00:00:00 2001 From: Scott Morris Date: Tue, 9 Nov 2010 17:34:09 -0500 Subject: [PATCH 1/4] Fixed + From 9632b421e01aaef05fcbc0b72dad3f2103b99615 Mon Sep 17 00:00:00 2001 From: Fred Dixon Date: Tue, 9 Nov 2010 19:21:41 -0500 Subject: [PATCH 2/4] - Changed message in bbb-conf from 0.71-Beta to 0.71 --- bigbluebutton-config/bin/bbb-conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bigbluebutton-config/bin/bbb-conf b/bigbluebutton-config/bin/bbb-conf index b9b295b7ef55..bd802af118d0 100755 --- a/bigbluebutton-config/bin/bbb-conf +++ b/bigbluebutton-config/bin/bbb-conf @@ -53,7 +53,7 @@ IP=$(ifconfig | grep -v '127.0.0.1' | grep -E "[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*" | GENTOO=$(uname -r | grep gentoo | cut -d- -f2); TOMCAT="" -BBB_VERSION="0.71-beta" +BBB_VERSION="0.71" # # Helper functions From 3a181428df05c29d00432a4090ba8a1ffa54a2f5 Mon Sep 17 00:00:00 2001 From: Fred Dixon Date: Tue, 9 Nov 2010 21:52:13 -0500 Subject: [PATCH 3/4] - Noticed revently that some webcams were not successfully opening on other computers ... lowering the quality just a bit --- bigbluebutton-client/resources/config.xml.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bigbluebutton-client/resources/config.xml.template b/bigbluebutton-client/resources/config.xml.template index 5f68fd42afd0..434af742fec3 100755 --- a/bigbluebutton-client/resources/config.xml.template +++ b/bigbluebutton-client/resources/config.xml.template @@ -42,7 +42,7 @@ From ad04fc4306047c75b69f7ec58ccde8176f3f382e Mon Sep 17 00:00:00 2001 From: Fred Dixon Date: Wed, 10 Nov 2010 07:49:46 -0500 Subject: [PATCH 4/4] - Added code to take only the first IP address from ifconfig (see issue 729) --- bigbluebutton-config/bin/bbb-conf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/bigbluebutton-config/bin/bbb-conf b/bigbluebutton-config/bin/bbb-conf index bd802af118d0..0996378b3b4f 100755 --- a/bigbluebutton-config/bin/bbb-conf +++ b/bigbluebutton-config/bin/bbb-conf @@ -49,7 +49,7 @@ elif cat /usr/share/red5/webapps/bigbluebutton/WEB-INF/red5-web.xml | grep -v '< VOICE_CONFERENCE="bbb-voice-freeswitch.xml" fi -IP=$(ifconfig | grep -v '127.0.0.1' | grep -E "[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*" | cut -d: -f2 | awk '{ print $1}') +IP=$(ifconfig | grep -v '127.0.0.1' | grep -E "[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*" | head -1 | cut -d: -f2 | awk '{ print $1}') GENTOO=$(uname -r | grep gentoo | cut -d- -f2); TOMCAT="" @@ -319,7 +319,6 @@ start_bigbluebutton () { echo -n "." sleep 1 done - echo fi if ! wget http://$NGINX_IP/bigbluebutton/api -O - --quiet | grep -q SUCCESS; then @@ -1193,7 +1192,7 @@ check_state() { fi SIP_SERVER_HOST=$(cat /usr/share/red5/webapps/sip/WEB-INF/bigbluebutton-sip.properties | sed -n '/sip.server.host=/{s/.*=//;s/;//;p}') - IP=$(ifconfig | grep -v '127.0.0.1' | grep -E "[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*" | cut -d: -f2 | awk '{ print $1}') + IP=$(ifconfig | grep -v '127.0.0.1' | grep -E "[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*" | head -1 | cut -d: -f2 | awk '{ print $1}') if [ $SIP_SERVER_HOST != $IP ]; then echo echo "# The IP address ($SIP_SERVER_HOST) set for sip.server.host in"