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

Merge pull request #6765 from ffdixon/fix-bbb-conf-18

Browse Source 
Properly assign kurento[0].url in default.yaml
This commit is contained in:
Fred Dixon 2019-02-11 23:59:48 -08:00 committed by GitHub
commit ef52de0bbd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bigbluebutton-config/bin/apply-config.template
View File

@ -43,7 +43,7 @@ HOST=$(cat $SERVLET_DIR/WEB-INF/classes/bigbluebutton.properties | grep -v '#' |
# Enable Looging of the HTML5 client for debugging
#
enableHTML5ClientLog() {
echo " - enable HTML5 client log"
echo " - Enable HTML5 client log to /var/log/nginx/html5-client.log"
HTML5_CONFIG=/usr/share/meteor/bundle/programs/server/assets/app/config/settings.yml
yq w -i $HTML5_CONFIG public.clientLog.external.enabled true
@ -65,6 +65,9 @@ HERE
apt-get install -y nginx-full
fi
touch /var/log/nginx/html5-client.log
chown bigbluebutton:bigbluebutton /var/log/nginx/html5-client.log
#
# You can monitor the live HTML5 client logs with the command
#

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

@ -877,7 +877,7 @@ check_configuration() {
if which host > /dev/null 2>&1; then
HOSTS=$(which host)
if [ $HOSTS ]; then
HOSTS=`$HOSTS $NGINX_IP | awk '{ print $4 }'`
HOSTS=`$HOSTS $NGINX_IP | awk '{ print $4 }' | head -n 1`
fi
fi
@ -1376,6 +1376,7 @@ check_state() {
SIP_NGINX_IP=$(cat /etc/bigbluebutton/nginx/sip.nginx | grep -v '#' | sed -n '/proxy_pass/{s/.*proxy_pass http[s]*:\/\///;s/:.*//;p}')
if [ "$SIP_NGINX_IP" != $IP ]; then
if [ "$SIP_NGINX_IP" != "\$freeswitch_addr" ]; then
echo "# Warning: The setting of $SIP_NGINX_IP for proxy_pass in"
echo "#"
echo "# /etc/bigbluebutton/nginx/sip.nginx"
@ -1383,6 +1384,7 @@ check_state() {
echo "# does not match the local IP address ($IP)."
echo "# (This is OK if you've manually changed the values)"
echo
fi
fi
VARS_IP=$(cat $FREESWITCH_VARS | sed -n '/"local_ip_v4/{s/.*local_ip_v4=//;s/".*//;p}')
@ -1946,10 +1948,6 @@ if [ -n "$HOST" ]; then
if [ -f $HTML5_CONFIG_OLD ]; then
WS=$(cat $SERVLET_DIR/WEB-INF/classes/bigbluebutton.properties | grep -v '#' | sed -n '/^bigbluebutton.web.serverURL/{s/.*=//;p}' | sed 's/https/wss/g' | sed s'/http/ws/g')
sed -i "s|\"wsUrl.*|\"wsUrl\": \"$WS/bbb-webrtc-sfu\",|g" $HTML5_CONFIG_OLD
if [ -f /usr/local/bigbluebutton/bbb-webrtc-sfu/config/default.yml ]; then
change_yml_value /usr/local/bigbluebutton/bbb-webrtc-sfu/config/default.yml kurentoUrl "ws://$HOST:8888/kurento"
fi
fi
if [ -f $HTML5_CONFIG ]; then
@ -1958,7 +1956,7 @@ if [ -n "$HOST" ]; then
change_yml_value $HTML5_CONFIG wsUrl "$WS/bbb-webrtc-sfu"
if [ -f /usr/local/bigbluebutton/bbb-webrtc-sfu/config/default.yml ]; then
change_yml_value /usr/local/bigbluebutton/bbb-webrtc-sfu/config/default.yml kurentoUrl "ws://$HOST:8888/kurento"
yq w -i /usr/local/bigbluebutton/bbb-webrtc-sfu/config/default.yml kurento[0].url "ws://$HOST:8888/kurento"
fi
fi