From e4176ee53a72edd58124da3e11a6841469060191 Mon Sep 17 00:00:00 2001 From: chandi Date: Wed, 16 Sep 2020 00:24:38 +0200 Subject: [PATCH 1/2] apply v2.2.24 changes --- bbb-webrtc-sfu | 2 +- mod/core/Dockerfile | 2 +- mod/core/web/bigbluebutton.properties | 5 +++++ mod/html5/Dockerfile | 4 ++-- mod/html5/settings.yml | 22 ++++++++++++++-------- mod/recordings/Dockerfile | 2 +- scripts/fs_cli | 6 ++++++ 7 files changed, 30 insertions(+), 13 deletions(-) create mode 100755 scripts/fs_cli diff --git a/bbb-webrtc-sfu b/bbb-webrtc-sfu index 8dfb34d..2a6343f 160000 --- a/bbb-webrtc-sfu +++ b/bbb-webrtc-sfu @@ -1 +1 @@ -Subproject commit 8dfb34d808b4648873340877904500629ba55dc6 +Subproject commit 2a6343f6ccdf16edaf50a73b776bf54ccad39b23 diff --git a/mod/core/Dockerfile b/mod/core/Dockerfile index 7b4cdcb..e021d9a 100644 --- a/mod/core/Dockerfile +++ b/mod/core/Dockerfile @@ -38,7 +38,7 @@ RUN equivs-control redis-server.control \ # this variable is not used, but it triggers # rebuilding from here on if changed -ENV VERSION v2.2.22 +ENV VERSION v2.2.24 RUN apt-get update && apt-get install -y bbb-web \ bbb-fsesl-akka bbb-apps-akka bbb-transcode-akka bbb-apps \ diff --git a/mod/core/web/bigbluebutton.properties b/mod/core/web/bigbluebutton.properties index 3f499c9..0631db4 100644 --- a/mod/core/web/bigbluebutton.properties +++ b/mod/core/web/bigbluebutton.properties @@ -355,3 +355,8 @@ lockSettingsLockOnJoinConfigurable=false allowDuplicateExtUserid=true defaultTextTrackUrl=${bigbluebutton.web.serverURL}/bigbluebutton + +# Param to end the meeting when there are no moderators after a certain period of time. +# Needed for classes where teacher gets disconnected and can't get back in. Prevents +# students from running amok. +endWhenNoModerator=false \ No newline at end of file diff --git a/mod/html5/Dockerfile b/mod/html5/Dockerfile index 1be4b9c..bb857f1 100644 --- a/mod/html5/Dockerfile +++ b/mod/html5/Dockerfile @@ -14,7 +14,7 @@ USER meteor ENV METEOR_VERSION 1.8.1 RUN curl -sL https://install.meteor.com?release=$METEOR_VERSION | sed s/--progress-bar/-sL/g | /bin/sh -ENV TAG v2.2.23 +ENV TAG v2.2.24 RUN cd ~ \ && svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/bigbluebutton-html5 \ && mv ~/bigbluebutton-html5 ~/source \ @@ -51,4 +51,4 @@ USER meteor ENTRYPOINT ["/entrypoint.sh"] # lets set the tag again, so that it is include in the image for later version retrieval -ENV TAG v2.2.23 +ENV TAG v2.2.24 diff --git a/mod/html5/settings.yml b/mod/html5/settings.yml index 789d06b..3afc057 100644 --- a/mod/html5/settings.yml +++ b/mod/html5/settings.yml @@ -11,7 +11,7 @@ public: appName: BigBlueButton HTML5 Client bbbServerVersion: 2.2 copyright: "©2020 BigBlueButton Inc." - html5ClientBuild: 1006 + html5ClientBuild: 1024 helpLink: https://bigbluebutton.org/html5/ lockOnJoin: true cdn: "" @@ -29,6 +29,10 @@ public: allowFullscreen: true remainingTimeThreshold: 30 remainingTimeAlertThreshold: 1 + # Warning: increasing the limit of breakout rooms per meeting + # can generate excessive overhead to the server. We recommend + # this value to be kept under 12. + breakoutRoomLimit: 8 defaultSettings: application: animations: true @@ -451,22 +455,24 @@ private: enabled: false minBrowserVersions: - browser: chrome - version: 59 + version: 72 - browser: chromeMobileIOS version: Infinity - browser: firefox - version: 52 + version: 63 - browser: firefoxMobile - version: 52 + version: 68 - browser: edge - version: 17 + version: 79 - browser: ie version: Infinity - browser: safari - version: [11, 1] + version: [12, 1] - browser: mobileSafari - version: [11, 1] + version: [12, 1] - browser: opera - version: 46 + version: 50 - browser: electron version: [0, 36] + - browser: YandexBrowser + version: 19 diff --git a/mod/recordings/Dockerfile b/mod/recordings/Dockerfile index ed793d7..0d7a78e 100644 --- a/mod/recordings/Dockerfile +++ b/mod/recordings/Dockerfile @@ -40,7 +40,7 @@ RUN mkdir -p \ /var/log/bigbluebutton \ /var/log/bigbluebutton/presentation -ENV TAG v2.2.23 +ENV TAG v2.2.24 # add bbb-record-core (lib, scripts and Gemfile) RUN cd /usr/local/bigbluebutton/core \ diff --git a/scripts/fs_cli b/scripts/fs_cli new file mode 100755 index 0000000..bd50e2c --- /dev/null +++ b/scripts/fs_cli @@ -0,0 +1,6 @@ +#!/bin/bash +set -e + +cd $(dirname $0)/.. + +./scripts/compose exec freeswitch fs_cli -H 10.7.7.1 \ No newline at end of file From 3e4cc72a2bfdc82bcf12e6d06c9bd115b3bb2061 Mon Sep 17 00:00:00 2001 From: chandi Date: Tue, 29 Sep 2020 20:24:00 +0200 Subject: [PATCH 2/2] v2.2.25 and v2.2.26 changes --- docker-compose.yml | 1 + mod/core/Dockerfile | 2 +- mod/html5/Dockerfile | 2 +- mod/html5/settings.yml | 2 +- mod/recordings/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 8511856..581f2a1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -102,6 +102,7 @@ services: KMS_MAX_PORT: 32768 KMS_TURN_URL: KMS_NETWORK_INTERFACES: ${NETWORK_INTERFACE:-} + GST_DEBUG: 3,Kurento*:4,kms*:4,KurentoWebSocketTransport:5 network_mode: host volumes: - vol-kurento:/var/kurento diff --git a/mod/core/Dockerfile b/mod/core/Dockerfile index e021d9a..5b506e8 100644 --- a/mod/core/Dockerfile +++ b/mod/core/Dockerfile @@ -38,7 +38,7 @@ RUN equivs-control redis-server.control \ # this variable is not used, but it triggers # rebuilding from here on if changed -ENV VERSION v2.2.24 +ENV VERSION v2.2.26 RUN apt-get update && apt-get install -y bbb-web \ bbb-fsesl-akka bbb-apps-akka bbb-transcode-akka bbb-apps \ diff --git a/mod/html5/Dockerfile b/mod/html5/Dockerfile index bb857f1..bf2ef87 100644 --- a/mod/html5/Dockerfile +++ b/mod/html5/Dockerfile @@ -14,7 +14,7 @@ USER meteor ENV METEOR_VERSION 1.8.1 RUN curl -sL https://install.meteor.com?release=$METEOR_VERSION | sed s/--progress-bar/-sL/g | /bin/sh -ENV TAG v2.2.24 +ENV TAG v2.2.26 RUN cd ~ \ && svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/bigbluebutton-html5 \ && mv ~/bigbluebutton-html5 ~/source \ diff --git a/mod/html5/settings.yml b/mod/html5/settings.yml index 3afc057..fb766ae 100644 --- a/mod/html5/settings.yml +++ b/mod/html5/settings.yml @@ -11,7 +11,7 @@ public: appName: BigBlueButton HTML5 Client bbbServerVersion: 2.2 copyright: "©2020 BigBlueButton Inc." - html5ClientBuild: 1024 + html5ClientBuild: 1032 helpLink: https://bigbluebutton.org/html5/ lockOnJoin: true cdn: "" diff --git a/mod/recordings/Dockerfile b/mod/recordings/Dockerfile index 0d7a78e..3eee13a 100644 --- a/mod/recordings/Dockerfile +++ b/mod/recordings/Dockerfile @@ -40,7 +40,7 @@ RUN mkdir -p \ /var/log/bigbluebutton \ /var/log/bigbluebutton/presentation -ENV TAG v2.2.24 +ENV TAG v2.2.26 # add bbb-record-core (lib, scripts and Gemfile) RUN cd /usr/local/bigbluebutton/core \