From b22247d05d3a203fd8d3375d44cae966684cd73b Mon Sep 17 00:00:00 2001 From: chandi Date: Sat, 23 May 2020 08:59:33 +0200 Subject: [PATCH] apply v2.2.12 changes --- mod/html5/settings.yml | 115 ++++++++++++++++------------- mod/periodic/Dockerfile | 2 +- mod/periodic/bbb-resync-freeswitch | 6 ++ mod/periodic/entrypoint.sh | 3 + 4 files changed, 73 insertions(+), 53 deletions(-) create mode 100755 mod/periodic/bbb-resync-freeswitch diff --git a/mod/html5/settings.yml b/mod/html5/settings.yml index 5ea6600..a31ce3d 100644 --- a/mod/html5/settings.yml +++ b/mod/html5/settings.yml @@ -9,9 +9,9 @@ public: skipCheck: false clientTitle: {{ .Env.CLIENT_TITLE }} appName: BigBlueButton HTML5 Client - bbbServerVersion: 2.2-dev + bbbServerVersion: 2.2 copyright: "©2019 BigBlueButton Inc." - html5ClientBuild: 870 + html5ClientBuild: 924 helpLink: https://bigbluebutton.org/html5/ lockOnJoin: true cdn: "" @@ -68,17 +68,14 @@ public: openActions: accesskey: A descId: openActions - openStatus: - accesskey: S - descId: openStatus branding: displayBrandingArea: false connectionTimeout: 60000 showHelpButton: true effectiveConnection: - - critical - - danger - - warning + - critical + - danger + - warning externalVideoPlayer: enabled: true networkMonitoring: @@ -90,27 +87,38 @@ public: chromeDefaultExtensionLink: {{ .Env.SCREENSHARE_EXTENSION_LINK }} chromeExtensionKey: KEY chromeExtensionLink: LINK - chromeScreenshareSources: - - window - - screen - firefoxScreenshareSource: window + screenshare: + constraints: + video: + frameRate: + ideal: 5 + max: 10 + width: + max: 2560 + height: + max: 1600 + audio: false + chromeScreenshareSources: + - window + - screen + firefoxScreenshareSource: window cameraProfiles: - - id: low - name: Low quality - default: false - bitrate: 100 - - id: medium - name: Medium quality - default: true - bitrate: 200 - - id: high - name: High quality - default: false - bitrate: 500 - - id: hd - name: High definition - default: false - bitrate: 800 + - id: low + name: Low quality + default: false + bitrate: 100 + - id: medium + name: Medium quality + default: true + bitrate: 200 + - id: high + name: High quality + default: false + bitrate: 500 + - id: hd + name: High definition + default: false + bitrate: 800 enableScreensharing: true enableVideo: true enableVideoStats: false @@ -170,6 +178,8 @@ public: hidePresentation: false media: stunTurnServersFetchAddress: "/bigbluebutton/api/stuns" + cacheStunTurnServers: true + fallbackStunServer: '' mediaTag: "#remote-media" callTransferTimeout: 5000 callHangupTimeout: 2000 @@ -215,6 +225,8 @@ public: mime: application/vnd.oasis.opendocument.image - extension: .jpg mime: image/jpeg + - extension: .jpeg + mime: image/jpeg - extension: .png mime: image/png user: @@ -301,10 +313,9 @@ public: - pencil - hand clientLog: - server: {enabled: true, level: info} - console: {enabled: true, level: debug} - external: {enabled: false, level: info, url: 'https://LOG_HOST/html5Log', method: POST, - throttleInterval: 400, flushOnClose: true, logTag: ""} + server: { enabled: true, level: info } + console: { enabled: true, level: debug } + external: { enabled: false, level: info, url: https://LOG_HOST/html5Log, method: POST, throttleInterval: 400, flushOnClose: true, logTag: "" } private: app: host: 0.0.0.0 @@ -347,23 +358,23 @@ private: heapdump: enabled: false minBrowserVersions: - - browser: chrome - version: 59 - - browser: chromeMobileIOS - version: Infinity - - browser: firefox - version: 52 - - browser: firefoxMobile - version: 52 - - browser: edge - version: 17 - - browser: ie - version: Infinity - - browser: safari - version: [11, 1] - - browser: mobileSafari - version: [11, 1] - - browser: opera - version: 46 - - browser: electron - version: [0, 36] + - browser: chrome + version: 59 + - browser: chromeMobileIOS + version: Infinity + - browser: firefox + version: 52 + - browser: firefoxMobile + version: 52 + - browser: edge + version: 17 + - browser: ie + version: Infinity + - browser: safari + version: [11, 1] + - browser: mobileSafari + version: [11, 1] + - browser: opera + version: 46 + - browser: electron + version: [0, 36] diff --git a/mod/periodic/Dockerfile b/mod/periodic/Dockerfile index 89f6e4e..d04e252 100644 --- a/mod/periodic/Dockerfile +++ b/mod/periodic/Dockerfile @@ -10,6 +10,6 @@ RUN apt-get update \ # -- install docker cli COPY --from=library/docker:latest /usr/local/bin/docker /usr/bin/docker -COPY bbb-restart-kms entrypoint.sh / +COPY bbb-restart-kms bbb-resync-freeswitch entrypoint.sh / ENTRYPOINT ["/entrypoint.sh"] \ No newline at end of file diff --git a/mod/periodic/bbb-resync-freeswitch b/mod/periodic/bbb-resync-freeswitch new file mode 100755 index 0000000..5e0c138 --- /dev/null +++ b/mod/periodic/bbb-resync-freeswitch @@ -0,0 +1,6 @@ +#!/bin/bash + +# https://github.com/bigbluebutton/bigbluebutton/pull/9597/files + +CONTAINER_ID=$(docker ps | grep freeswitch | awk '{print $1}') +docker exec -it $CONTAINER_ID fs_cli -H 10.7.7.1 -P 8021 -x 'fsctl sync_clock_when_idle' \ No newline at end of file diff --git a/mod/periodic/entrypoint.sh b/mod/periodic/entrypoint.sh index d210f5a..fce381a 100755 --- a/mod/periodic/entrypoint.sh +++ b/mod/periodic/entrypoint.sh @@ -9,6 +9,9 @@ while : do # restart kurento after 24h /bbb-restart-kms + + # resync freeswitch + /bbb-resync-freeswitch # delete presentations older than N days find /var/bigbluebutton/ -maxdepth 1 -type d -name "*-*" -mtime +$history -exec rm -rf '{}' +