correctly sort in TAG_BBB_PRESENTATION_VIDEO in tags.env

Fix learning-dashboard (alias)

CHANGELOG.md

@@ -1,9 +1,16 @@
 # Changelog
 
 ## Unreleased
+
+## Release v2.6.0-2 (2023-04-04)
+- hotfix for broken freeswitch container due to enabled compresion with max file count == 1 [#260](https://github.com/bigbluebutton/docker/issues/260)
+
+## Release v2.6.0 (2023-04-03)
 - **Breaking change:** Greenlight v3 (see [upgrade note](docs/upgrading.md) @alangecker [#255](https://github.com/bigbluebutton/docker/pull/255) 
 - BigBlueButton v2.6 @alangecker [#255](https://github.com/bigbluebutton/docker/pull/255) 
+- Set client_max_body_size for greenlight @nr23730 [#252](https://github.com/bigbluebutton/docker/pull/252)
 - self building freeswitch (applying patches and independent from external apt repos) @alangecker
+- reduce amount of logs with senstivie data @alangecker
 
 ## Release v2.5.8 (2022-11-06)
 - BBB 2.5.8 @alangecker [#238](https://github.com/bigbluebutton/docker/pull/238)

docker-compose.tmpl.yml

@@ -134,6 +134,13 @@ services:
       - ./conf/dialplan_public:/etc/freeswitch/dialplan/public_docker
       - vol-freeswitch:/var/freeswitch/meetings
     network_mode: host
+    logging:
+      # reduce logs to a minimum, so `docker-compose logs -f` still works
+      driver: "local"
+      options:
+        max-size: "10k"
+        max-file: "1"
+        compress: "false"
 
   nginx:
     build:

mod/nginx/bbb/learning-dashboard.nginx

@@ -1,5 +1,5 @@
 location ~ /learning-analytics-dashboard/([0-9a-f]+-[0-9]+)/(.*) {
-    root /var/bigbluebutton/learning-analytics-dashboard/;
+    alias /var/bigbluebutton/learning-dashboard/$1/$2;
     autoindex off;
 }
 

mod/nginx/bigbluebutton

@@ -33,11 +33,20 @@ server {
   # Include specific rules for record and playback
   include /etc/nginx/bbb/*.nginx;
 
+  # redirect old greenlight v2 room links
+  location ~ "/b/([a-z0-9\-]+)" {
+    return 302 /rooms/$1;
+  }
+
+  # serve default.pdf from /www/
+  location = /default.pdf {
+    try_files $uri =404;
+  }
 
   location / {
     proxy_pass          http://greenlight:3000;
     proxy_set_header    Host              $host;
-    proxy_set_header    X-Forwarded-For   $proxy_add_x_forwarded_for;
+    proxy_set_header    X-Forwarded-For   "127.0.0.1";
     proxy_set_header    X-Forwarded-Proto $scheme;
     proxy_set_header    X-Forwarded-Ssl on;
     proxy_http_version  1.1;
@@ -47,7 +56,7 @@ server {
   location /cable {
     proxy_pass          http://greenlight:3000;
     proxy_set_header    Host              $host;
-    proxy_set_header    X-Forwarded-For   $proxy_add_x_forwarded_for;
+    proxy_set_header    X-Forwarded-For   "127.0.0.1";
     proxy_set_header    X-Forwarded-Proto $scheme;
     proxy_set_header    X-Forwarded-Ssl on;
     proxy_set_header    Upgrade           $http_upgrade;

mod/recordings/entrypoint.sh

@@ -3,6 +3,7 @@
 touch /var/log/bigbluebutton/recording.log
 touch /var/log/bigbluebutton/bbb-web.log
 touch /var/log/bigbluebutton/sanity.log
+touch /var/log/bigbluebutton/post_publish.log
 mkdir -p /var/log/bigbluebutton/presentation
 chown -R bigbluebutton:bigbluebutton /var/log/bigbluebutton
 

scripts/fs_cli

@@ -9,4 +9,4 @@ then
   export $(cat .env | sed 's/#.*//g' | grep "FSESL_PASSWORD" | xargs)
 fi
 
-docker-compose exec freeswitch fs_cli -H 10.7.7.1 -p "$FSESL_PASSWORD"
+docker-compose exec freeswitch /opt/freeswitch/bin/fs_cli -H 10.7.7.1 -p "$FSESL_PASSWORD"

tags.env

@@ -8,13 +8,14 @@ BBB_BUILD_TAG=v2022-12-29-grails-524
 
 # https://github.com/bigbluebutton/bigbluebutton
 TAG_COMMON_MESSAGE=v2.6.0
-TAG_APPS_AKKA=v2.6.0
+TAG_APPS_AKKA=v2.6.1
 TAG_FSESL_AKKA=v2.6.0
-TAG_BBB_WEB=v2.6.0
+TAG_BBB_WEB=v2.6.1
-TAG_HTML5=v2.6.0
+TAG_HTML5=v2.6.1
-TAG_RECORDINGS=v2.6.0
+TAG_RECORDINGS=v2.6.1
 
 TAG_LEARNING_DASHBOARD=v2.6.0
+TAG_BBB_PRESENTATION_VIDEO=4.0.1
 TAG_FS_CONFIG=v2.6.0
 TAG_FS_BUILD_FILES=v2.6.0
 
@@ -26,6 +27,5 @@ TAG_GREENLIGHT=v3.0.2
 # match the provided tags here
 TAG_WEBRTC_SFU=v2.9.8
 TAG_WEBHOOKS=v2.6.0
-TAG_PLAYBACK=v5.0.0-rc.2
+TAG_PLAYBACK=v5.0.0
 TAG_PADS=v1.4.1
-TAG_BBB_PRESENTATION_VIDEO=4.0.0-rc.2