changes for BBB 2.3-beta-2

docker-compose.tmpl.yml

@@ -43,7 +43,6 @@ services:
     restart: unless-stopped
     depends_on:
         - redis
-        - libreoffice
     healthcheck:
       test: wget --no-verbose --tries=1 --spider http://10.7.7.2:8090/bigbluebutton/api || exit 1
       start_period: 2m
@@ -62,7 +61,6 @@ services:
       - bigbluebutton:/var/bigbluebutton
       - vol-freeswitch:/var/freeswitch/meetings
       - vol-kurento:/var/kurento
-      - vol-libreoffice:/var/tmp/soffice
     networks:
       bbb-net:
         ipv4_address: 10.7.7.2
@@ -238,17 +236,16 @@ services:
       bbb-net:
         ipv4_address: 10.7.7.15
 
-
+  jodconverter:
-  libreoffice:
+    image: eugenmayer/jodconverter:rest
-    build: mod/libreoffice
     restart: unless-stopped
-    volumes:
+    deploy:
-      - vol-libreoffice:/var/tmp/soffice
+      resources:
-    tmpfs:
+        limits:
-      - /tmp
+          memory: 512M
     networks:
       bbb-net:
-        ipv4_address: 10.7.7.7
+        ipv4_address: 10.7.7.20
   
   periodic:
     build: mod/periodic
@@ -375,7 +372,6 @@ volumes:
   vol-freeswitch:
   vol-kurento:
   html5-static:
-  vol-libreoffice:
 {{ if isTrue .Env.ENABLE_HTTPS_PROXY }}
   ssl_data:
 {{end}}

mod/apps-akka/Dockerfile

@@ -3,7 +3,7 @@ FROM mozilla/sbt:8u181_1.2.7 AS builder
 RUN apt-get update && apt-get install -y subversion
 
 # download bbb-common-message
-ENV TAG_COMMON_MESSAGE v2.3-beta-1
+ENV TAG_COMMON_MESSAGE v2.3-beta-2
 RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_MESSAGE/bbb-common-message /bbb-common-message \
     && rm -rf /bbb-common-message/.svn
 
@@ -14,7 +14,7 @@ RUN cd /bbb-common-message \
 
 # ===================================================
 
-ENV TAG v2.3-beta-1
+ENV TAG v2.3-beta-2
 RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/akka-bbb-apps /source \
     && rm -rf /source/.svn
 

mod/bbb-web/Dockerfile

@@ -3,7 +3,7 @@ FROM mozilla/sbt:8u181_1.2.7 AS builder
 RUN apt-get update && apt-get install -y subversion
 
 # download bbb-common-message
-ENV TAG_COMMON_MESSAGE v2.3-beta-1
+ENV TAG_COMMON_MESSAGE v2.3-beta-2
 RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_MESSAGE/bbb-common-message /bbb-common-message \
     && rm -rf /bbb-common-message/.svn
 
@@ -26,7 +26,7 @@ RUN cd /opt \
 ENV PATH="/opt/gradle-6.7/bin:${PATH}"
 
 # download bbb-common-web
-ENV TAG_COMMON_WEB v2.3-beta-1
+ENV TAG_COMMON_WEB v2.3-beta-2
 RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_WEB/bbb-common-web /bbb-common-web \
     && rm -rf /bbb-common-message/.svn
 
@@ -35,7 +35,7 @@ RUN cd /bbb-common-web \
  && ./deploy.sh
 
 # download bbb-web
-ENV TAG_WEB v2.3-beta-1
+ENV TAG_WEB v2.3-beta-2
 RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_WEB/bigbluebutton-web /bbb-web \
     && rm -rf /bbb-web/.svn
 
@@ -54,7 +54,7 @@ FROM openjdk:8-jre-slim-buster
 
 RUN apt-get update && apt-get install -y \
         wget unzip gosu socat locales \
-        imagemagick xpdf-utils 
+        imagemagick xpdf-utils curl
 
 # set locale
 RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
@@ -97,5 +97,6 @@ COPY entrypoint.sh /entrypoint.sh
 COPY bigbluebutton.properties /usr/share/bbb-web/WEB-INF/classes/bigbluebutton.properties.tmpl
 COPY turn-stun-servers.xml /usr/share/bbb-web/WEB-INF/classes/spring/turn-stun-servers.xml.tmpl
 COPY logback.xml /usr/share/bbb-web/WEB-INF/classes/logback.xml
+COPY office-convert.sh /usr/share/bbb-libreoffice-conversion/convert.sh
 
 ENTRYPOINT ["/entrypoint.sh"]

mod/bbb-web/bigbluebutton.properties

@@ -49,19 +49,8 @@ presCheckExec=/usr/share/prescheck/prescheck.sh
 skipOfficePrecheck=true
 
 #----------------------------------------------------
-# Number of soffice processes that are running on this machine
+# Executable for presentation office conversion
-sofficeManagers=4
+presOfficeConversionExec=/usr/share/bbb-libreoffice-conversion/convert.sh
-
-#----------------------------------------------------
-# Port number of the first soffice process
-sofficeBasePort=8201
-
-#----------------------------------------------------
-# Working directory prefix for each soffice process.
-# The value of this is appended with the number of the
-# soffice process (starting at 1), padded to two digits
-# (e.g. /var/tmp/soffice_01 for the first process).
-sofficeWorkingDirBase=/var/tmp/soffice/instance_
 
 #----------------------------------------------------
 # These will be copied in cases where the conversion process
@@ -109,6 +98,16 @@ numConversionThreads=5
 #------------------------------------
 numFileProcessorThreads=2
 
+#------------------------------------
+# Timeout(secs) to wait for conversion script execution
+#------------------------------------
+officeToPdfConversionTimeout=60
+
+#------------------------------------
+# Max concurrent of conversion script execution
+#------------------------------------
+officeToPdfMaxConcurrentConversions=4
+
 #----------------------------------------------------
 # Conversion of the presentation slides to SWF to be
 # used in the Flash client

mod/bbb-web/entrypoint.sh

@@ -1,13 +1,6 @@
 #!/bin/bash
 set -e
 
-# forward libreoffice ports to this container
-for i in `seq 1 4` ; do
-    let PORT=8200+${i}
-    echo "forward port $PORT to the libreoffice container"
-    socat TCP-LISTEN:$PORT,fork TCP:10.7.7.7:$PORT &
-done
-
 # create recording directory structure if it doesn't exist yet
 mkdir -p /var/bigbluebutton/recording/raw
 mkdir -p /var/bigbluebutton/recording/process

mod/bbb-web/office-convert.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+# This script receives two params
+# Param 1: Input office file path (e.g. "/tmp/test.odt")
+# Param 2: Output pdf file path (e.g. "/tmp/test.pdf")
+
+curl -v -X POST "http://jodconverter:8080/lool/convert-to/pdf" \
+    -H "accept: application/octet-stream" \
+    -H "Content-Type: multipart/form-data" \
+    -F "data=@$1" > $2
+
+exit 0

mod/freeswitch/conf/sip_profiles/external-ipv6.xml

@@ -36,7 +36,7 @@
     <!--<param name="enable-100rel" value="true"/>-->
     <!--<param name="disable-srv503" value="true"/>-->
     <!-- This could be set to "passive" -->
-    <param name="local-network-acl" value="localnet.auto"/>
+    <param name="local-network-acl" value="none"/>
     <param name="manage-presence" value="false"/>
 
     <!-- Added for Microsoft Edge support 

mod/freeswitch/conf/sip_profiles/external.xml

@@ -36,7 +36,7 @@
     <!--<param name="enable-100rel" value="true"/>-->
     <!--<param name="disable-srv503" value="true"/>-->
     <!-- This could be set to "passive" -->
-    <param name="local-network-acl" value="localnet.auto"/>
+    <param name="local-network-acl" value="none"/>
     <param name="manage-presence" value="false"/>
 
 

mod/fsesl-akka/Dockerfile

@@ -3,7 +3,7 @@ FROM mozilla/sbt:8u181_1.2.7 AS builder
 RUN apt-get update && apt-get install -y subversion
 
 # download bbb-common-message
-ENV TAG_COMMON_MESSAGE v2.3-beta-1
+ENV TAG_COMMON_MESSAGE v2.3-beta-2
 RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_MESSAGE/bbb-common-message /bbb-common-message \
     && rm -rf /bbb-common-message/.svn
 
@@ -13,7 +13,7 @@ RUN cd /bbb-common-message \
 
 
 # ===================================================
-ENV TAG_FSESL v2.3-beta-1
+ENV TAG_FSESL v2.3-beta-2
 RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_FSESL/bbb-fsesl-client /bbb-fsesl-client \
     && rm -rf /bbb-fsesl-client/.svn
 
@@ -21,7 +21,7 @@ RUN cd /bbb-fsesl-client \
     && ./deploy.sh
 
 
-ENV TAG v2.3-beta-1
+ENV TAG v2.3-beta-2
 RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/akka-bbb-fsesl /source \
     && rm -rf /source/.svn
 

mod/html5/Dockerfile

@@ -14,7 +14,7 @@ USER meteor
 ENV METEOR_VERSION 1.10.2
 RUN curl -sL https://install.meteor.com?release=$METEOR_VERSION | sed s/--progress-bar/-sL/g | /bin/sh
 
-ENV TAG v2.3-beta-1
+ENV TAG v2.3-beta-2
 RUN cd ~ \
     && svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/bigbluebutton-html5 \
     && mv ~/bigbluebutton-html5 ~/source \

mod/html5/settings.yml

@@ -8,11 +8,19 @@ public:
     forceListenOnly: false
     skipCheck: {{ .Env.DISABLE_ECHO_TEST }}
     skipCheckOnJoin: false
+    #
+    # Allow users to change microphone/speaker dinamically
+    # The device is changed immediately, without the need to rejoin
+    # audio. Default value is true
+    # Firefox users: if no output devices is shown, you may set the flag
+    # "media.setsinkid.enabled" to make it work properly
+    # enableDynamicAudioDeviceSelection: true
+    #
     clientTitle: {{ .Env.CLIENT_TITLE }}
     appName: BigBlueButton HTML5 Client
     bbbServerVersion: 2.3-dev-docker
     copyright: '©2021 BigBlueButton Inc.'
-    html5ClientBuild: "1511-docker"
+    html5ClientBuild: "1551-docker"
     helpLink: https://bigbluebutton.org/html5/
     lockOnJoin: true
     cdn: ''
@@ -43,7 +51,7 @@ public:
     enableDebugWindow: true
     # 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.
+    # this value to be kept under 16.
     breakouts:
       breakoutRoomLimit: {{ .Env.BREAKOUTROOM_LIMIT }}
       sendInvitationToIncludedModerators: false
@@ -163,10 +171,10 @@ public:
       mediaTimeouts:
         maxConnectionAttempts: 2
         # Base screen media timeout (send|recv)
-        baseTimeout: 15000
+        baseTimeout: 30000
         # Max timeout: used as the max camera subscribe reconnection timeout. Each
         # subscribe reattempt increases the reconnection timer up to this
-        maxTimeout: 35000
+        maxTimeout: 60000
         timeoutIncreaseFactor: 1.5
       constraints:
         video:
@@ -355,6 +363,8 @@ public:
     time: 5000
   chat:
     enabled: {{ .Env.CHAT_ENABLED }}
+    itemsPerPage: 100
+    timeBetweenFetchs: 1000
     bufferChatInsertsMs: 0
     startClosed: {{ .Env.CHAT_START_CLOSED }}
     min_message_length: 1
@@ -418,7 +428,11 @@ public:
     enabled: true
     interval: 2000
     length: 5
+    timeout: 30000
     log: false
+    notification:
+      warning: false
+      error: true
     jitter:
       - 10
       - 20
@@ -427,6 +441,10 @@ public:
       - 0.05
       - 0.1
       - 0.2
+    rtt:
+      - 500
+      - 1000
+      - 2000
     level:
       - warning
       - danger

mod/libreoffice/Dockerfile

@@ -1,15 +0,0 @@
-FROM woahbase/alpine-libreoffice
-
-USER root
-
-RUN apk add --no-cache \
-        su-exec \
-        font-noto \
-        font-noto-cjk
-
-# should use the same user ID as in `core` to avoid file permission issues
-RUN addgroup -g 998 bigbluebutton && adduser -D -u 998 -G bigbluebutton bigbluebutton
-COPY entrypoint.sh /entrypoint.sh
-
-
-ENTRYPOINT /entrypoint.sh

mod/libreoffice/entrypoint.sh

@@ -1,21 +0,0 @@
-#!/bin/sh
-set -e
-
-for i in `seq 1 4` ; do
-
-	SOFFICE_WORK_DIR="/var/tmp/soffice/instance_"`printf "%02d\n" ${i}`
-	mkdir -p $SOFFICE_WORK_DIR
-    chown bigbluebutton:bigbluebutton $SOFFICE_WORK_DIR
-
-    # Initialize environment
-    su-exec bigbluebutton /usr/lib/libreoffice/program/soffice.bin -env:UserInstallation="file:///tmp/office_${i}/" || true
-done
-
-
-for i in `seq 1 4` ; do
-    let PORT=8200+${i}
-    echo "start libreoffice on port ${PORT}"
-    su-exec bigbluebutton  /usr/lib/libreoffice/program/soffice.bin --accept="socket,host=0.0.0.0,port=$PORT,tcpNoDelay=1;urp;StarOffice.ServiceManager" --headless --invisible --nocrashreport --nodefault --nofirststartwizard --nolockcheck --nologo --norestore -env:UserInstallation="file:///tmp/office_${i}/" &
-done
-
-wait $!

mod/periodic/bbb-restart-kms

@@ -12,7 +12,7 @@ if [ ! -f /tmp/bbb-kms-last-restart.txt ]; then
   exit
 fi
 
-users=$(mongo --quiet mongodb://10.7.7.6:27017/meteor --eval "db.users.count({connectionStatus: 'online'})")
+users=$(mongo --quiet mongodb://10.7.7.6:27017/meteor --eval "db.users.count()")
 echo "currently active users: $users"
 
 if [ "$users" -eq 0 ]; then

mod/recordings/Dockerfile

@@ -45,7 +45,7 @@ RUN mkdir -p \
     /usr/local/bigbluebutton/core \
     /etc/bigbluebutton
 
-ENV TAG v2.3-beta-1
+ENV TAG v2.3-beta-2
 
 # add bbb-record-core (lib, scripts and Gemfile)
 RUN cd /usr/local/bigbluebutton/core \

mod/recordings/bigbluebutton.yml

@@ -22,6 +22,12 @@ redis_port: 6379
 # redis_workers_host: 127.0.0.1
 # redis_workers_port: 6379
 
+# Set to true to insert recording process status into
+# redis list with key "store_recording_status: true".
+# This is useful if you want to track progress status
+# and have another script process it.
+store_recording_status: false
+
 # Sequence of recording steps. Keys are the current step, values
 # are the next step(s). Examples:
 #   current_step: next_step

mod/webrtc-sfu/bbb-webrtc-sfu

@@ -1 +1 @@
-Subproject commit 02adc818dcb18e2dd73ba043b92391820cd121ff
+Subproject commit c26960e58779aa8508a8ae411e331c3744e5ca99