From 49a5af5b9129de947b48bca85d574598ce1baa54 Mon Sep 17 00:00:00 2001
From: chandi <git@chandi.it>
Date: Mon, 30 Nov 2020 16:55:54 +0100
Subject: [PATCH] Applied v2.2.30 changes

---
 CHANGELOG.md                  | 2 +-
 bbb-webrtc-sfu                | 2 +-
 docker-compose.prometheus.yml | 2 +-
 docker-compose.yml            | 2 +-
 mod/html5/Dockerfile          | 4 ++--
 mod/html5/settings.yml        | 5 +++--
 mod/recordings/Dockerfile     | 2 +-
 7 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f7f416..a272dfb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Changelog
 
 ## Unreleased
-## Release v2.2.29-1 (2020-11-23)
+- Applied v2.2.30 changes @alangecker
 - Applied v2.2.29 changes @alangecker
 
 ## Release v2.2.28-1 (2020-10-22) #67
diff --git a/bbb-webrtc-sfu b/bbb-webrtc-sfu
index 49a5152..0ea5bd5 160000
--- a/bbb-webrtc-sfu
+++ b/bbb-webrtc-sfu
@@ -1 +1 @@
-Subproject commit 49a515238114fe7e4bec3aa94af2e7c9f511f4a7
+Subproject commit 0ea5bd5d14f3d96c6f5ce4b5c238fbdef82e6d87
diff --git a/docker-compose.prometheus.yml b/docker-compose.prometheus.yml
index 0132cf1..b05de89 100644
--- a/docker-compose.prometheus.yml
+++ b/docker-compose.prometheus.yml
@@ -2,7 +2,7 @@ version: '3.6'
 
 services:
   prometheus-exporter:
-    image: greenstatic/bigbluebutton-exporter:v0.5.2
+    image: greenstatic/bigbluebutton-exporter:v0.6.0
     restart: unless-stopped
     environment: 
       API_BASE_URL: http://10.7.7.1:8080/bigbluebutton/api/
diff --git a/docker-compose.yml b/docker-compose.yml
index ba05fd1..d35fe51 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -93,7 +93,7 @@ services:
         ipv4_address: 10.7.7.6
 
   kurento:
-    image: kurento/kurento-media-server:6.14
+    image: kurento/kurento-media-server:6.15
     restart: unless-stopped
     environment: 
       KMS_STUN_IP: ${STUN_IP}
diff --git a/mod/html5/Dockerfile b/mod/html5/Dockerfile
index 0cb9254..ff902da 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.29
+ENV TAG v2.2.30
 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.29
+ENV TAG v2.2.30
diff --git a/mod/html5/settings.yml b/mod/html5/settings.yml
index 3df8ae3..af9509c 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: 1081
+    html5ClientBuild: 1095
     helpLink: https://bigbluebutton.org/html5/
     lockOnJoin: true
     cdn: ""
@@ -36,6 +36,7 @@ public:
     # can generate excessive overhead to the server. We recommend
     # this value to be kept under 12.
     breakoutRoomLimit: {{ .Env.BREAKOUTROOM_LIMIT }}
+    customHeartbeat: false
     defaultSettings:
       application:
         animations: true
@@ -419,7 +420,7 @@ public:
       - pencil
       - hand
   clientLog:
-    server: { enabled: true, level: info }
+    server: { enabled: false, 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:
diff --git a/mod/recordings/Dockerfile b/mod/recordings/Dockerfile
index 9c04fce..4f25704 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.27
+ENV TAG v2.2.30
 
 # add bbb-record-core (lib, scripts and Gemfile)
 RUN cd /usr/local/bigbluebutton/core \