diff --git a/bbb-webrtc-sfu b/bbb-webrtc-sfu
index 400fe63..8dfb34d 160000
--- a/bbb-webrtc-sfu
+++ b/bbb-webrtc-sfu
@@ -1 +1 @@
-Subproject commit 400fe636e63563437fb112c2df0261d6be9f103e
+Subproject commit 8dfb34d808b4648873340877904500629ba55dc6
diff --git a/mod/core/Dockerfile b/mod/core/Dockerfile
index c53d192..7b4cdcb 100644
--- a/mod/core/Dockerfile
+++ b/mod/core/Dockerfile
@@ -48,6 +48,15 @@ RUN apt-get update && apt-get install -y bbb-web \
# https://github.com/bigbluebutton/bigbluebutton/issues/8959
RUN sed -i 's|securerandom.source=file:/dev/random|securerandom.source=file:/dev/urandom|g' /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/security/java.security
+# add blank presentation files and allow conversation to pdf/svg
+RUN mkdir -p /usr/share/bigbluebutton/blank \
+ && wget -O /usr/share/bigbluebutton/blank/blank-svg.svg https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/$VERSION/bigbluebutton-config/slides/blank-svg.svg \
+ && wget -O /usr/share/bigbluebutton/blank/blank-thumb.png https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/$VERSION/bigbluebutton-config/slides/blank-thumb.png \
+ && wget -O /usr/share/bigbluebutton/blank/blank-presentation.pdf https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/$VERSION/bigbluebutton-config/slides/blank-presentation.pdf \
+ && wget -O /usr/share/bigbluebutton/blank/blank-png.png https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/$VERSION/bigbluebutton-config/slides/blank-png.png \
+ && sed -i 's///g' /etc/ImageMagick-6/policy.xml
+
+
# -- copy configuration files
COPY red5-webapps/bigbluebutton/application.conf /usr/share/red5/webapps/bigbluebutton/WEB-INF/classes/application.conf
COPY red5-webapps/bigbluebutton/bigbluebutton.properties /usr/share/red5/webapps/bigbluebutton/WEB-INF/bigbluebutton.properties
diff --git a/mod/etherpad/settings.json b/mod/etherpad/settings.json
index 1261824..c5bd1a9 100644
--- a/mod/etherpad/settings.json
+++ b/mod/etherpad/settings.json
@@ -310,7 +310,12 @@
* instead of the reverse proxy's IP.
*/
"trustProxy": true,
-
+
+ /*
+ * When embedding the pads in an iframe set this to true.
+ */
+ "forceSameSiteNone": false,
+
/*
* Privacy: disable IP logging
*/
diff --git a/mod/html5/Dockerfile b/mod/html5/Dockerfile
index 96d1e7b..1be4b9c 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.22
+ENV TAG v2.2.23
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.22
+ENV TAG v2.2.23
diff --git a/mod/html5/settings.yml b/mod/html5/settings.yml
index a6b8e77..6b5261c 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: 992
+ html5ClientBuild: 1006
helpLink: https://bigbluebutton.org/html5/
lockOnJoin: true
cdn: ""
@@ -160,15 +160,15 @@ public:
constraints:
frameRate: 10
- id: low
- name: Low quality
- default: true
+ name: Low
+ default: false
bitrate: 100
- id: medium
- name: Medium quality
- default: false
+ name: Medium
+ default: true
bitrate: 200
- id: high
- name: High quality
+ name: High
default: false
bitrate: 500
- id: hd
@@ -200,6 +200,21 @@ public:
profile: low-u25
- threshold: 30
profile: low-u30
+ pagination:
+ # whether to globally enable or disable pagination.
+ enabled: false
+ # how long (in ms) the negotiation will be debounced after a page change.
+ pageChangeDebounceTime: 2500
+ # video page sizes for DESKTOP endpoints. It stands for the number of SUBSCRIBER streams.
+ # PUBLISHERS aren't accounted for .
+ # A page size of 0 (zero) means that the page size is unlimited (disabled).
+ desktopPageSizes:
+ moderator: 0
+ viewer: 5
+ # video page sizes for MOBILE endpoints
+ mobilePageSizes:
+ moderator: 2
+ viewer: 2
pingPong:
clearUsersInSeconds: 180
pongTimeInSeconds: 15