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

Merge pull request #6893 from ffdixon/prep-2.2

Browse Source 
Prep 2.2
This commit is contained in:
Fred Dixon 2019-03-04 09:58:56 -05:00 committed by GitHub
commit 82ac198478
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1315,7 +1315,7 @@ check_state() {
check_no_value server_name /etc/nginx/sites-available/bigbluebutton $BBB_WEB check_no_value server_name /etc/nginx/sites-available/bigbluebutton $BBB_WEB
COUNT=0 COUNT=0
while [ $COUNT -lt 30 ]; do while [ $COUNT -lt 45 ]; do
let COUNT=COUNT+1 let COUNT=COUNT+1
timeout 1s wget $PROTOCOL://$BBB_WEB/bigbluebutton/api -O - --quiet | grep -q SUCCESS timeout 1s wget $PROTOCOL://$BBB_WEB/bigbluebutton/api -O - --quiet | grep -q SUCCESS
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then

4
bigbluebutton-html5/private/config/settings.yml
View File

@ -13,7 +13,7 @@ public:
bbbServerVersion: 2.2-dev bbbServerVersion: 2.2-dev
copyright: "©2019 BigBlueButton Inc." copyright: "©2019 BigBlueButton Inc."
html5ClientBuild: HTML5_CLIENT_VERSION html5ClientBuild: HTML5_CLIENT_VERSION
helpLink: https://bigbluebutton.org/videos/ helpLink: https://bigbluebutton.org/html5/
lockOnJoin: true lockOnJoin: true
basename: "/html5client" basename: "/html5client"
askForFeedbackOnLogout: false askForFeedbackOnLogout: false
@ -100,7 +100,7 @@ public:
enableVideo: true enableVideo: true
enableVideoStats: false enableVideoStats: false
enableVideoMenu: true enableVideoMenu: true
enableListenOnly: false enableListenOnly: true
autoShareWebcam: false autoShareWebcam: false
allowOutsideCommands: allowOutsideCommands:
toggleRecording: false toggleRecording: false