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

Issue #3985: bbb-conf --debug incorrectly flags

Browse Source 
Tracked the error down to bbb-record line 718 ff. which is called by bbb-conf --debug and misses support for "https". Added support for "https" and incorrect flagging vanishes.
This commit is contained in:
Harald Kastner 2017-06-22 10:53:10 +02:00 committed by GitHub
parent 0bae307f5e
commit 1672bc7b73
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bigbluebutton-config/bin/bbb-record
View File

@ -716,10 +716,11 @@ if [ $CHECK ]; then
#set -x #set -x
for type in $TYPES; do for type in $TYPES; do
for recording in $(find $BASE/publish/$type -name metadata.xml); do for recording in $(find $BASE/publish/$type -name metadata.xml); do
url_playback=$(cat $recording | grep "<link>" | sed 's/[ ]*<link>http:\/\/\([^\"\/]*\)[^>]*>/\1/g') url_playback_http=$(cat $recording | grep "<link>" | sed 's/[ ]*<link>http:\/\/\([^\"\/]*\)[^>]*>/\1/g')
if [ "$BBB_WEB" != "$url_playback" ]; then url_playback_https=$(cat $recording | grep "<link>" | sed 's/[ ]*<link>https:\/\/\([^\"\/]*\)[^>]*>/\1/g')
if [ "$BBB_WEB" != "$url_playback_http" ] && [ "$BBB_WEB" != "$url_playback_https" ]; then
echo echo
echo "# The hostname in <link> .. </link> ($url_playback)" echo "# The hostname in <link> .. </link> ($url_playback_http)"
echo "# $recording" echo "# $recording"
echo "# do not match the hostname for bigbluebutton.web.serverURL ($BBB_WEB)" echo "# do not match the hostname for bigbluebutton.web.serverURL ($BBB_WEB)"
echo "# /usr/share/red5/webapps/bigbluebutton/WEB-INF/bigbluebutton.properties" echo "# /usr/share/red5/webapps/bigbluebutton/WEB-INF/bigbluebutton.properties"
@ -727,10 +728,11 @@ if [ $CHECK ]; then
fi fi
done done
for recording in $(find /var/bigbluebutton/published/$type -name metadata.xml); do for recording in $(find /var/bigbluebutton/published/$type -name metadata.xml); do
url_playback=$(cat $recording | grep "<link>" | sed 's/[ ]*<link>http:\/\/\([^\"\/]*\)[^>]*>/\1/g') url_playback_http=$(cat $recording | grep "<link>" | sed 's/[ ]*<link>http:\/\/\([^\"\/]*\)[^>]*>/\1/g')
if [ "$BBB_WEB" != "$url_playback" ]; then url_playback_https=$(cat $recording | grep "<link>" | sed 's/[ ]*<link>https:\/\/\([^\"\/]*\)[^>]*>/\1/g')
if [ "$BBB_WEB" != "$url_playback_http" ] && [ "$BBB_WEB" != "$url_playback_https" ]; then
echo echo
echo "# The hostname in <link> .. </link> ($url_playback)" echo "# The hostname in <link> .. </link> ($url_playback_http)"
echo "# $recording" echo "# $recording"
echo "# do not match the hostname for bigbluebutton.web.serverURL ($BBB_WEB)" echo "# do not match the hostname for bigbluebutton.web.serverURL ($BBB_WEB)"
echo "# /usr/share/red5/webapps/bigbluebutton/WEB-INF/bigbluebutton.properties" echo "# /usr/share/red5/webapps/bigbluebutton/WEB-INF/bigbluebutton.properties"