From 8e282568b80362aaa1ac5c87e9c8eadf5be0babc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <s@saghul.net>
Date: Tue, 30 Jan 2024 09:46:08 +0100
Subject: [PATCH 01/32] misc: working on unstable

---
 docker-compose.yml | 8 ++++----
 jibri.yml          | 2 +-
 jigasi.yml         | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index fda29f252c..e06286aa7a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.5'
 services:
     # Frontend
     web:
-        image: jitsi/web:${JITSI_IMAGE_VERSION:-stable-9220-1}
+        image: jitsi/web:${JITSI_IMAGE_VERSION:-unstable}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '${HTTP_PORT}:80'
@@ -169,7 +169,7 @@ services:
 
     # XMPP server
     prosody:
-        image: jitsi/prosody:${JITSI_IMAGE_VERSION:-stable-9220-1}
+        image: jitsi/prosody:${JITSI_IMAGE_VERSION:-unstable}
         restart: ${RESTART_POLICY:-unless-stopped}
         expose:
             - '${XMPP_PORT:-5222}'
@@ -300,7 +300,7 @@ services:
 
     # Focus component
     jicofo:
-        image: jitsi/jicofo:${JITSI_IMAGE_VERSION:-stable-9220-1}
+        image: jitsi/jicofo:${JITSI_IMAGE_VERSION:-unstable}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '127.0.0.1:${JICOFO_REST_PORT:-8888}:8888'
@@ -382,7 +382,7 @@ services:
 
     # Video bridge
     jvb:
-        image: jitsi/jvb:${JITSI_IMAGE_VERSION:-stable-9220-1}
+        image: jitsi/jvb:${JITSI_IMAGE_VERSION:-unstable}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '${JVB_PORT:-10000}:${JVB_PORT:-10000}/udp'
diff --git a/jibri.yml b/jibri.yml
index ef5bdbb18a..a0b4937dbe 100644
--- a/jibri.yml
+++ b/jibri.yml
@@ -2,7 +2,7 @@ version: '3.5'
 
 services:
     jibri:
-        image: jitsi/jibri:${JITSI_IMAGE_VERSION:-stable-9220-1}
+        image: jitsi/jibri:${JITSI_IMAGE_VERSION:-unstable}
         restart: ${RESTART_POLICY:-unless-stopped}
         volumes:
             - ${CONFIG}/jibri:/config:Z
diff --git a/jigasi.yml b/jigasi.yml
index fb9cecfe2f..210d5916cc 100644
--- a/jigasi.yml
+++ b/jigasi.yml
@@ -3,7 +3,7 @@ version: '3.5'
 services:
     # SIP gateway (audio)
     jigasi:
-        image: jitsi/jigasi:${JITSI_IMAGE_VERSION:-stable-9220-1}
+        image: jitsi/jigasi:${JITSI_IMAGE_VERSION:-unstable}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '${JIGASI_PORT_MIN:-20000}-${JIGASI_PORT_MAX:-20050}:${JIGASI_PORT_MIN:-20000}-${JIGASI_PORT_MAX:-20050}/udp'

From 14efd9cc6d61cff6981a98e1c158d566a3b311cc Mon Sep 17 00:00:00 2001
From: bgrozev <boris@jitsi.org>
Date: Tue, 30 Jan 2024 13:07:34 -0600
Subject: [PATCH 02/32] prosody: disable "offline" and "register" modules.
 (#1727)

---
 prosody/rootfs/defaults/prosody.cfg.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/prosody/rootfs/defaults/prosody.cfg.lua b/prosody/rootfs/defaults/prosody.cfg.lua
index 8864b8bdae..1f1b5d2643 100644
--- a/prosody/rootfs/defaults/prosody.cfg.lua
+++ b/prosody/rootfs/defaults/prosody.cfg.lua
@@ -131,7 +131,8 @@ firewall_scripts = {
 -- These modules are auto-loaded, but should you want
 -- to disable them then uncomment them here:
 modules_disabled = {
-	-- "offline"; -- Store offline messages
+    "offline"; -- Store offline messages
+    "register";
 	-- "c2s"; -- Handle client connections
 
 	{{ if not $ENABLE_S2S -}}

From bb694076024d001603adde6cc78f3575fb542b18 Mon Sep 17 00:00:00 2001
From: bgrozev <boris@jitsi.org>
Date: Tue, 30 Jan 2024 14:33:10 -0600
Subject: [PATCH 03/32] Remove "ping" in ViarualHosts (#1728)

It's already present in the global modules_enabled and thus loaded for
each VirtualHost.
---
 prosody/rootfs/defaults/conf.d/brewery.cfg.lua    | 4 ----
 prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua | 6 ------
 prosody/rootfs/defaults/conf.d/visitors.cfg.lua   | 2 --
 3 files changed, 12 deletions(-)

diff --git a/prosody/rootfs/defaults/conf.d/brewery.cfg.lua b/prosody/rootfs/defaults/conf.d/brewery.cfg.lua
index d225cb8ec0..a139f98d6f 100644
--- a/prosody/rootfs/defaults/conf.d/brewery.cfg.lua
+++ b/prosody/rootfs/defaults/conf.d/brewery.cfg.lua
@@ -13,9 +13,6 @@ admins = {
 plugin_paths = { "/prosody-plugins/", "/prosody-plugins-custom" }
 
 VirtualHost "{{ $JVB_XMPP_AUTH_DOMAIN }}"
-    modules_enabled = {
-      "ping";
-    }
     authentication = "internal_hashed"
     ssl = {
         key = "/config/certs/{{ $JVB_XMPP_AUTH_DOMAIN }}.key";
@@ -24,7 +21,6 @@ VirtualHost "{{ $JVB_XMPP_AUTH_DOMAIN }}"
 
 Component "{{ $JVB_XMPP_INTERNAL_MUC_DOMAIN }}" "muc"
     modules_enabled = {
-      "ping",
       "muc_hide_all";
       "muc_filter_access";
     }
diff --git a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua b/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua
index 91fe458ef4..1971eaa223 100644
--- a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua
+++ b/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua
@@ -130,7 +130,6 @@ smacks_max_old_sessions = 1;
 {{ if $ENABLE_JAAS_COMPONENTS }}
 VirtualHost "jigasi.meet.jitsi"
     modules_enabled = {
-      "ping";
       "bosh";
       "muc_password_check";
     }
@@ -196,7 +195,6 @@ VirtualHost "{{ $XMPP_DOMAIN }}"
         "websocket";
         "smacks"; -- XEP-0198: Stream Management
         {{ end }}
-        "ping";
         "speakerstats";
         "conference_duration";
         "room_metadata";
@@ -271,7 +269,6 @@ VirtualHost "{{ $XMPP_DOMAIN }}"
 VirtualHost "{{ $XMPP_GUEST_DOMAIN }}"
     authentication = "{{ $GUEST_AUTH_TYPE }}"
     modules_enabled = {
-        "ping";
         {{ if $ENABLE_XMPP_WEBSOCKET }}
         "smacks"; -- XEP-0198: Stream Management
         {{ end }}
@@ -291,14 +288,12 @@ VirtualHost "{{ $XMPP_AUTH_DOMAIN }}"
     }
     modules_enabled = {
         "limits_exception";
-        "ping";
     }
     authentication = "internal_hashed"
 
 {{ if $ENABLE_RECORDING }}
 VirtualHost "{{ $XMPP_RECORDER_DOMAIN }}"
     modules_enabled = {
-      "ping";
       "smacks";
     }
     authentication = "internal_hashed"
@@ -307,7 +302,6 @@ VirtualHost "{{ $XMPP_RECORDER_DOMAIN }}"
 Component "{{ $XMPP_INTERNAL_MUC_DOMAIN }}" "muc"
     storage = "memory"
     modules_enabled = {
-        "ping";
         {{ if .Env.XMPP_INTERNAL_MUC_MODULES -}}
         "{{ join "\";\n\"" (splitList "," .Env.XMPP_INTERNAL_MUC_MODULES) }}";
         {{ end -}}
diff --git a/prosody/rootfs/defaults/conf.d/visitors.cfg.lua b/prosody/rootfs/defaults/conf.d/visitors.cfg.lua
index 51520ebe6a..dd64041a5c 100644
--- a/prosody/rootfs/defaults/conf.d/visitors.cfg.lua
+++ b/prosody/rootfs/defaults/conf.d/visitors.cfg.lua
@@ -112,7 +112,6 @@ VirtualHost 'v{{ $VISITOR_INDEX }}.{{ $VISITORS_XMPP_DOMAIN }}'
     }
     modules_enabled = {
       'bosh';
-      'ping';
       "external_services";
       {{ if $ENABLE_XMPP_WEBSOCKET -}}
       "websocket";
@@ -134,7 +133,6 @@ VirtualHost 'v{{ $VISITOR_INDEX }}.{{ $VISITORS_XMPP_DOMAIN }}'
 VirtualHost '{{ $XMPP_AUTH_DOMAIN}}'
     modules_enabled = {
       'limits_exception';
-      'ping';
     }
     authentication = 'internal_hashed'
 

From a1d1f2ce5a0e13a1b67d4fec1057fdd779df2f4f Mon Sep 17 00:00:00 2001
From: Jaya Allamsetty <54324652+jallamsetty1@users.noreply.github.com>
Date: Wed, 31 Jan 2024 14:26:36 -0500
Subject: [PATCH 04/32] web: Add env vars for setting 1080p and 4k bitrates.

* web: Add env vars for setting 1080p and 4k bitrates.

* squash: Fix c&p errors
---
 docker-compose.yml                     |   8 ++
 web/rootfs/defaults/settings-config.js | 132 ++++++++++++++++++-------
 2 files changed, 104 insertions(+), 36 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index e06286aa7a..104dcce722 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -141,18 +141,26 @@ services:
             - VIDEOQUALITY_BITRATE_H264_LOW
             - VIDEOQUALITY_BITRATE_H264_STANDARD
             - VIDEOQUALITY_BITRATE_H264_HIGH
+            - VIDEOQUALITY_BITRATE_H264_FULL
+            - VIDEOQUALITY_BITRATE_H264_ULTRA
             - VIDEOQUALITY_BITRATE_H264_SS_HIGH
             - VIDEOQUALITY_BITRATE_VP8_LOW
             - VIDEOQUALITY_BITRATE_VP8_STANDARD
             - VIDEOQUALITY_BITRATE_VP8_HIGH
+            - VIDEOQUALITY_BITRATE_VP8_FULL
+            - VIDEOQUALITY_BITRATE_VP8_ULTRA
             - VIDEOQUALITY_BITRATE_VP8_SS_HIGH
             - VIDEOQUALITY_BITRATE_VP9_LOW
             - VIDEOQUALITY_BITRATE_VP9_STANDARD
             - VIDEOQUALITY_BITRATE_VP9_HIGH
+            - VIDEOQUALITY_BITRATE_VP9_FULL
+            - VIDEOQUALITY_BITRATE_VP9_ULTRA
             - VIDEOQUALITY_BITRATE_VP9_SS_HIGH
             - VIDEOQUALITY_BITRATE_AV1_LOW
             - VIDEOQUALITY_BITRATE_AV1_STANDARD
             - VIDEOQUALITY_BITRATE_AV1_HIGH
+            - VIDEOQUALITY_BITRATE_AV1_FULL
+            - VIDEOQUALITY_BITRATE_AV1_ULTRA
             - VIDEOQUALITY_BITRATE_AV1_SS_HIGH
             - VIDEOQUALITY_PREFERRED_CODEC
             - XMPP_AUTH_DOMAIN
diff --git a/web/rootfs/defaults/settings-config.js b/web/rootfs/defaults/settings-config.js
index eda44c0054..4a5fbb133b 100644
--- a/web/rootfs/defaults/settings-config.js
+++ b/web/rootfs/defaults/settings-config.js
@@ -408,48 +408,108 @@ config.videoQuality = {};
 config.videoQuality.preferredCodec = '{{ .Env.VIDEOQUALITY_PREFERRED_CODEC }}';
 {{ end -}}
 
-{{ if and .Env.VIDEOQUALITY_BITRATE_AV1_LOW .Env.VIDEOQUALITY_BITRATE_AV1_STANDARD .Env.VIDEOQUALITY_BITRATE_AV1_HIGH .Env.VIDEOQUALITY_BITRATE_AV1_SS_HIGH -}}
-config.videoQuality.av1 = {
-    maxBitratesVideo: {
-        low: {{ .Env.VIDEOQUALITY_BITRATE_AV1_LOW }},
-        standard: {{ .Env.VIDEOQUALITY_BITRATE_AV1_STANDARD }},
-        high: {{ .Env.VIDEOQUALITY_BITRATE_AV1_HIG }},
-        ssHigh: {{ .Env.VIDEOQUALITY_BITRATE_AV1_SS_HIGH }}
-    }
-}
+config.videoQuality.av1 = {};
+
+{{ if .Env.VIDEOQUALITY_BITRATE_AV1_LOW }}
+config.videoQuality.av1.low = {{ .Env.VIDEOQUALITY_BITRATE_AV1_LOW }};
 {{ end -}}
 
-{{ if and .Env.VIDEOQUALITY_BITRATE_H264_LOW .Env.VIDEOQUALITY_BITRATE_H264_STANDARD .Env.VIDEOQUALITY_BITRATE_H264_HIGH .Env.VIDEOQUALITY_BITRATE_H264_SS_HIGH -}}
-config.videoQuality.h264 = {
-    maxBitratesVideo: {
-        low: {{ .Env.VIDEOQUALITY_BITRATE_H264_LOW }},
-        standard: {{ .Env.VIDEOQUALITY_BITRATE_H264_STANDARD }},
-        high: {{ .Env.VIDEOQUALITY_BITRATE_H264_HIGH }},
-        ssHigh: {{ .Env.VIDEOQUALITY_BITRATE_H264_SS_HIGH }}
-    }
-}
+{{ if .Env.VIDEOQUALITY_BITRATE_AV1_STANDARD }}
+config.videoQuality.av1.standard = {{ .Env.VIDEOQUALITY_BITRATE_AV1_STANDARD }};
 {{ end -}}
 
-{{ if and .Env.VIDEOQUALITY_BITRATE_VP8_LOW .Env.VIDEOQUALITY_BITRATE_VP8_STANDARD .Env.VIDEOQUALITY_BITRATE_VP8_HIGH .Env.VIDEOQUALITY_BITRATE_VP8_SS_HIGH -}}
-config.videoQuality.vp8 = {
-    maxBitratesVideo: {
-        low: {{ .Env.VIDEOQUALITY_BITRATE_VP8_LOW }},
-        standard: {{ .Env.VIDEOQUALITY_BITRATE_VP8_STANDARD }},
-        high: {{ .Env.VIDEOQUALITY_BITRATE_VP8_HIGH }},
-        ssHigh: {{ .Env.VIDEOQUALITY_BITRATE_VP8_SS_HIGH }}
-    }
-}
+{{ if .Env.VIDEOQUALITY_BITRATE_AV1_HIGH }}
+config.videoQuality.av1.high = {{ .Env.VIDEOQUALITY_BITRATE_AV1_HIGH }};
 {{ end -}}
 
-{{ if and .Env.VIDEOQUALITY_BITRATE_VP9_LOW .Env.VIDEOQUALITY_BITRATE_VP9_STANDARD .Env.VIDEOQUALITY_BITRATE_VP9_HIGH .Env.VIDEOQUALITY_BITRATE_VP9_SS_HIGH -}}
-config.videoQuality.vp9 = {
-    maxBitratesVideo: {
-        low: {{ .Env.VIDEOQUALITY_BITRATE_VP9_LOW }},
-        standard: {{ .Env.VIDEOQUALITY_BITRATE_VP9_STANDARD }},
-        high: {{ .Env.VIDEOQUALITY_BITRATE_VP9_HIGH }},
-        ssHigh: {{ .Env.VIDEOQUALITY_BITRATE_VP9_SS_HIGH }}
-    }
-}
+{{ if .Env.VIDEOQUALITY_BITRATE_AV1_FULL }}
+config.videoQuality.av1.fullHd = {{ .Env.VIDEOQUALITY_BITRATE_AV1_FULL }};
+{{ end -}}
+
+{{ if .Env.VIDEOQUALITY_BITRATE_AV1_ULTRA }}
+config.videoQuality.av1.ultraHd = {{ .Env.VIDEOQUALITY_BITRATE_AV1_ULTRA }};
+{{ end -}}
+
+{{ if .Env.VIDEOQUALITY_BITRATE_AV1_SS_HIGH }}
+config.videoQuality.av1.ssHigh = {{ .Env.VIDEOQUALITY_BITRATE_AV1_SS_HIGH }};
+{{ end -}}
+
+config.videoQuality.h264 = {};
+
+{{ if .Env.VIDEOQUALITY_BITRATE_H264_LOW }}
+config.videoQuality.h264.low = {{ .Env.VIDEOQUALITY_BITRATE_H264_LOW }};
+{{ end -}}
+
+{{ if .Env.VIDEOQUALITY_BITRATE_H264_STANDARD }}
+config.videoQuality.h264.standard = {{ .Env.VIDEOQUALITY_BITRATE_H264_STANDARD }};
+{{ end -}}
+
+{{ if .Env.VIDEOQUALITY_BITRATE_H264_HIGH }}
+config.videoQuality.h264.high = {{ .Env.VIDEOQUALITY_BITRATE_H264_HIGH }};
+{{ end -}}
+
+{{ if .Env.VIDEOQUALITY_BITRATE_H264_FULL }}
+config.videoQuality.h264.fullHd = {{ .Env.VIDEOQUALITY_BITRATE_H264_FULL }};
+{{ end -}}
+
+{{ if .Env.VIDEOQUALITY_BITRATE_H264_ULTRA }}
+config.videoQuality.h264.ultraHd = {{ .Env.VIDEOQUALITY_BITRATE_H264_ULTRA }};
+{{ end -}}
+
+{{ if .Env.VIDEOQUALITY_BITRATE_H264_SS_HIGH }}
+config.videoQuality.h264.ssHigh = {{ .Env.VIDEOQUALITY_BITRATE_H264_SS_HIGH }};
+{{ end -}}
+
+config.videoQuality.vp8 = {};
+
+{{ if .Env.VIDEOQUALITY_BITRATE_VP8_LOW }}
+config.videoQuality.vp8.low = {{ .Env.VIDEOQUALITY_BITRATE_VP8_LOW }};
+{{ end -}}
+
+{{ if .Env.VIDEOQUALITY_BITRATE_VP8_STANDARD }}
+config.videoQuality.vp8.standard = {{ .Env.VIDEOQUALITY_BITRATE_VP8_STANDARD }};
+{{ end -}}
+
+{{ if .Env.VIDEOQUALITY_BITRATE_VP8_HIGH }}
+config.videoQuality.vp8.high = {{ .Env.VIDEOQUALITY_BITRATE_VP8_HIGH }};
+{{ end -}}
+
+{{ if .Env.VIDEOQUALITY_BITRATE_VP8_FULL }}
+config.videoQuality.vp8.fullHd = {{ .Env.VIDEOQUALITY_BITRATE_VP8_FULL }};
+{{ end -}}
+
+{{ if .Env.VIDEOQUALITY_BITRATE_VP8_ULTRA }}
+config.videoQuality.vp8.ultraHd = {{ .Env.VIDEOQUALITY_BITRATE_VP8_ULTRA }};
+{{ end -}}
+
+{{ if .Env.VIDEOQUALITY_BITRATE_VP8_SS_HIGH }}
+config.videoQuality.vp8.ssHigh = {{ .Env.VIDEOQUALITY_BITRATE_VP8_SS_HIGH }};
+{{ end -}}
+
+config.videoQuality.vp9 = {};
+
+{{ if .Env.VIDEOQUALITY_BITRATE_VP9_LOW }}
+config.videoQuality.vp9.low = {{ .Env.VIDEOQUALITY_BITRATE_VP9_LOW }};
+{{ end -}}
+
+{{ if .Env.VIDEOQUALITY_BITRATE_VP9_STANDARD }}
+config.videoQuality.vp9.standard = {{ .Env.VIDEOQUALITY_BITRATE_VP9_STANDARD }};
+{{ end -}}
+
+{{ if .Env.VIDEOQUALITY_BITRATE_VP9_HIGH }}
+config.videoQuality.vp9.high = {{ .Env.VIDEOQUALITY_BITRATE_VP9_HIGH }};
+{{ end -}}
+
+{{ if .Env.VIDEOQUALITY_BITRATE_VP9_FULL }}
+config.videoQuality.vp9.fullHd = {{ .Env.VIDEOQUALITY_BITRATE_VP9_FULL }};
+{{ end -}}
+
+{{ if .Env.VIDEOQUALITY_BITRATE_VP9_ULTRA }}
+config.videoQuality.vp9.ultraHd = {{ .Env.VIDEOQUALITY_BITRATE_VP9_ULTRA }};
+{{ end -}}
+
+{{ if .Env.VIDEOQUALITY_BITRATE_VP9_SS_HIGH }}
+config.videoQuality.vp9.ssHigh = {{ .Env.VIDEOQUALITY_BITRATE_VP9_SS_HIGH }};
 {{ end -}}
 
  // Reactions

From 5c5742b838410012f62ae578486711c2c6c3d367 Mon Sep 17 00:00:00 2001
From: Aaron van Meerten <aaron.van.meerten@gmail.com>
Date: Mon, 5 Feb 2024 13:40:39 -0600
Subject: [PATCH 05/32] prosody: var for speakerstats modules

* prosody: var for speakerstats modules
---
 docker-compose.yml                                | 1 +
 prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 104dcce722..6a1fc17aee 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -301,6 +301,7 @@ services:
             - XMPP_RECORDER_DOMAIN
             - XMPP_PORT
             - XMPP_SERVER_S2S_PORT
+            - XMPP_SPEAKERSTATS_MODULES
         networks:
             meet.jitsi:
                 aliases:
diff --git a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua b/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua
index 1971eaa223..479b0f9688 100644
--- a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua
+++ b/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua
@@ -397,6 +397,11 @@ Component "focus.{{ $XMPP_DOMAIN }}" "client_proxy"
 
 Component "speakerstats.{{ $XMPP_DOMAIN }}" "speakerstats_component"
     muc_component = "{{ $XMPP_MUC_DOMAIN }}"
+    {{- if .Env.XMPP_SPEAKERSTATS_MODULES }}
+    modules_enabled = {
+        "{{ join "\";\n        \"" (splitList "," .Env.XMPP_SPEAKERSTATS_MODULES) }}";
+    }
+    {{- end }}
 
 Component "conferenceduration.{{ $XMPP_DOMAIN }}" "conference_duration_component"
     muc_component = "{{ $XMPP_MUC_DOMAIN }}"

From a198d56e061968e5afad74ef3c53819ef4166068 Mon Sep 17 00:00:00 2001
From: BifbofII <christoph@jabs-family.de>
Date: Fri, 9 Feb 2024 11:45:15 +0200
Subject: [PATCH 06/32] compose: add jvb dependency to web container (#1739)

since web runs dig jvb on startup, if jvb isn't up yet, this can fail or point to a wrong ip, leading the colibri websocket connection to fail
---
 docker-compose.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 6a1fc17aee..c4fce69e95 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -174,6 +174,8 @@ services:
             - WHITEBOARD_COLLAB_SERVER_PUBLIC_URL
         networks:
             meet.jitsi:
+        depends_on:
+            - jvb
 
     # XMPP server
     prosody:

From b47db9230100ace2a79d1793da54169fab99c497 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <s@saghul.net>
Date: Thu, 15 Feb 2024 11:53:32 +0100
Subject: [PATCH 07/32] release: stable-9258

* a198d56 compose: add jvb dependency to web container (#1739)
* 5c5742b prosody: var for speakerstats modules
* a1d1f2c web: Add env vars for setting 1080p and 4k bitrates.
* bb69407 Remove "ping" in ViarualHosts (#1728)
* 14efd9c prosody: disable "offline" and "register" modules. (#1727)
* 8e28256 misc: working on unstable
---
 CHANGELOG.md       | 11 +++++++++++
 docker-compose.yml |  8 ++++----
 jibri.yml          |  2 +-
 jigasi.yml         |  2 +-
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8a8a6f99d..a2174a1cda 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## stable-9258
+
+Based on stable release 9258.
+
+* a198d56 compose: add jvb dependency to web container (#1739)
+* 5c5742b prosody: var for speakerstats modules
+* a1d1f2c web: Add env vars for setting 1080p and 4k bitrates.
+* bb69407 Remove "ping" in ViarualHosts (#1728)
+* 14efd9c prosody: disable "offline" and "register" modules. (#1727)
+* 8e28256 misc: working on unstable
+
 ## stable-9220-1
 
 Based on stable release 9220-1.
diff --git a/docker-compose.yml b/docker-compose.yml
index c4fce69e95..23e08b301b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.5'
 services:
     # Frontend
     web:
-        image: jitsi/web:${JITSI_IMAGE_VERSION:-unstable}
+        image: jitsi/web:${JITSI_IMAGE_VERSION:-stable-9258}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '${HTTP_PORT}:80'
@@ -179,7 +179,7 @@ services:
 
     # XMPP server
     prosody:
-        image: jitsi/prosody:${JITSI_IMAGE_VERSION:-unstable}
+        image: jitsi/prosody:${JITSI_IMAGE_VERSION:-stable-9258}
         restart: ${RESTART_POLICY:-unless-stopped}
         expose:
             - '${XMPP_PORT:-5222}'
@@ -311,7 +311,7 @@ services:
 
     # Focus component
     jicofo:
-        image: jitsi/jicofo:${JITSI_IMAGE_VERSION:-unstable}
+        image: jitsi/jicofo:${JITSI_IMAGE_VERSION:-stable-9258}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '127.0.0.1:${JICOFO_REST_PORT:-8888}:8888'
@@ -393,7 +393,7 @@ services:
 
     # Video bridge
     jvb:
-        image: jitsi/jvb:${JITSI_IMAGE_VERSION:-unstable}
+        image: jitsi/jvb:${JITSI_IMAGE_VERSION:-stable-9258}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '${JVB_PORT:-10000}:${JVB_PORT:-10000}/udp'
diff --git a/jibri.yml b/jibri.yml
index a0b4937dbe..c29cd50ada 100644
--- a/jibri.yml
+++ b/jibri.yml
@@ -2,7 +2,7 @@ version: '3.5'
 
 services:
     jibri:
-        image: jitsi/jibri:${JITSI_IMAGE_VERSION:-unstable}
+        image: jitsi/jibri:${JITSI_IMAGE_VERSION:-stable-9258}
         restart: ${RESTART_POLICY:-unless-stopped}
         volumes:
             - ${CONFIG}/jibri:/config:Z
diff --git a/jigasi.yml b/jigasi.yml
index 210d5916cc..9c1c72071c 100644
--- a/jigasi.yml
+++ b/jigasi.yml
@@ -3,7 +3,7 @@ version: '3.5'
 services:
     # SIP gateway (audio)
     jigasi:
-        image: jitsi/jigasi:${JITSI_IMAGE_VERSION:-unstable}
+        image: jitsi/jigasi:${JITSI_IMAGE_VERSION:-stable-9258}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '${JIGASI_PORT_MIN:-20000}-${JIGASI_PORT_MAX:-20050}:${JIGASI_PORT_MIN:-20000}-${JIGASI_PORT_MAX:-20050}/udp'

From eccf68e7591ee53a4bbc6bd71cc120094c683e37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <s@saghul.net>
Date: Thu, 15 Feb 2024 11:53:32 +0100
Subject: [PATCH 08/32] misc: working on unstable

---
 docker-compose.yml | 8 ++++----
 jibri.yml          | 2 +-
 jigasi.yml         | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 23e08b301b..c4fce69e95 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.5'
 services:
     # Frontend
     web:
-        image: jitsi/web:${JITSI_IMAGE_VERSION:-stable-9258}
+        image: jitsi/web:${JITSI_IMAGE_VERSION:-unstable}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '${HTTP_PORT}:80'
@@ -179,7 +179,7 @@ services:
 
     # XMPP server
     prosody:
-        image: jitsi/prosody:${JITSI_IMAGE_VERSION:-stable-9258}
+        image: jitsi/prosody:${JITSI_IMAGE_VERSION:-unstable}
         restart: ${RESTART_POLICY:-unless-stopped}
         expose:
             - '${XMPP_PORT:-5222}'
@@ -311,7 +311,7 @@ services:
 
     # Focus component
     jicofo:
-        image: jitsi/jicofo:${JITSI_IMAGE_VERSION:-stable-9258}
+        image: jitsi/jicofo:${JITSI_IMAGE_VERSION:-unstable}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '127.0.0.1:${JICOFO_REST_PORT:-8888}:8888'
@@ -393,7 +393,7 @@ services:
 
     # Video bridge
     jvb:
-        image: jitsi/jvb:${JITSI_IMAGE_VERSION:-stable-9258}
+        image: jitsi/jvb:${JITSI_IMAGE_VERSION:-unstable}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '${JVB_PORT:-10000}:${JVB_PORT:-10000}/udp'
diff --git a/jibri.yml b/jibri.yml
index c29cd50ada..a0b4937dbe 100644
--- a/jibri.yml
+++ b/jibri.yml
@@ -2,7 +2,7 @@ version: '3.5'
 
 services:
     jibri:
-        image: jitsi/jibri:${JITSI_IMAGE_VERSION:-stable-9258}
+        image: jitsi/jibri:${JITSI_IMAGE_VERSION:-unstable}
         restart: ${RESTART_POLICY:-unless-stopped}
         volumes:
             - ${CONFIG}/jibri:/config:Z
diff --git a/jigasi.yml b/jigasi.yml
index 9c1c72071c..210d5916cc 100644
--- a/jigasi.yml
+++ b/jigasi.yml
@@ -3,7 +3,7 @@ version: '3.5'
 services:
     # SIP gateway (audio)
     jigasi:
-        image: jitsi/jigasi:${JITSI_IMAGE_VERSION:-stable-9258}
+        image: jitsi/jigasi:${JITSI_IMAGE_VERSION:-unstable}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '${JIGASI_PORT_MIN:-20000}-${JIGASI_PORT_MAX:-20050}:${JIGASI_PORT_MIN:-20000}-${JIGASI_PORT_MAX:-20050}/udp'

From 1bbb4ab0b7ba9adcfde0155ba759bf76f7e90284 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=B0=D0=BC=D1=8F=D0=BD=20=D0=9C=D0=B8=D0=BD=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=B2?= <damencho@jitsi.org>
Date: Thu, 15 Feb 2024 16:37:04 -0600
Subject: [PATCH 09/32] fix(prosody): Updates a rate whitelist config that
 changed in jitsi-meet. (#1741)

* fix(prosody): Updates a rate whitelist config that changed in jitsi-meet.

* squash: Update prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua

Co-authored-by: Aaron van Meerten <aaron.van.meerten@gmail.com>

* squash: Update prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua

Co-authored-by: Aaron van Meerten <aaron.van.meerten@gmail.com>

* squash: Update jitsi-meet.cfg.lua

---------

Co-authored-by: Aaron van Meerten <aaron.van.meerten@gmail.com>
---
 prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua | 5 ++---
 prosody/rootfs/defaults/conf.d/visitors.cfg.lua   | 4 ----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua b/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua
index 479b0f9688..84d9c0bb39 100644
--- a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua
+++ b/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua
@@ -363,9 +363,8 @@ Component "{{ $XMPP_MUC_DOMAIN }}" "muc"
 {{ end }}
     };
 
-    rate_limit_whitelist_jids = {
-        "{{ $JIBRI_RECORDER_USER }}@{{ $XMPP_RECORDER_DOMAIN }}",
-        "{{ $JIGASI_TRANSCRIBER_USER }}@{{ $XMPP_RECORDER_DOMAIN }}"    
+    rate_limit_whitelist_hosts = {
+        "{{ $XMPP_RECORDER_DOMAIN }}";
     }
     {{ end -}}
 
diff --git a/prosody/rootfs/defaults/conf.d/visitors.cfg.lua b/prosody/rootfs/defaults/conf.d/visitors.cfg.lua
index dd64041a5c..843b74cf97 100644
--- a/prosody/rootfs/defaults/conf.d/visitors.cfg.lua
+++ b/prosody/rootfs/defaults/conf.d/visitors.cfg.lua
@@ -186,10 +186,6 @@ Component '{{ $VISITORS_MUC_PREFIX }}.v{{ $VISITOR_INDEX }}.{{ $VISITORS_XMPP_DO
       {{ end -}}
     };
 
-    rate_limit_whitelist_jids = {
-        "{{ $JIBRI_RECORDER_USER }}@{{ $XMPP_RECORDER_DOMAIN }}",
-        "{{ $JIGASI_TRANSCRIBER_USER }}@{{ $XMPP_RECORDER_DOMAIN }}"    
-    }
     {{ end -}}
 
 	-- The size of the cache that saves state for IP addresses

From 8f84f2f916c6317946891e25a9f7747fc9ee09a2 Mon Sep 17 00:00:00 2001
From: Kurt Garloff <kurt@garloff.de>
Date: Sun, 18 Feb 2024 14:32:05 +0100
Subject: [PATCH 10/32] jibri: use storage.googleapis.com location for
 chromedriver

This is the place listed on
https://googlechromelabs.github.io/chrome-for-testing/
which would seem to be the least likely to silently break.
Currently, the edgedl.me.gvt1.com location is broken.

Signed-off-by: Kurt Garloff <kurt@garloff.de>
---
 jibri/rootfs/usr/bin/install-chrome.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jibri/rootfs/usr/bin/install-chrome.sh b/jibri/rootfs/usr/bin/install-chrome.sh
index b8fe139b56..9b89e1a4f0 100755
--- a/jibri/rootfs/usr/bin/install-chrome.sh
+++ b/jibri/rootfs/usr/bin/install-chrome.sh
@@ -33,7 +33,7 @@ else
     fi
 
     CHROMEDRIVER_ZIP="/tmp/chromedriver_linux64.zip"
-    curl -4Lso ${CHROMEDRIVER_ZIP} "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/${CHROMEDRIVER_RELEASE}/linux64/chromedriver-linux64.zip"
+    curl -4Lso ${CHROMEDRIVER_ZIP} "https://storage.googleapis.com/chrome-for-testing-public/${CHROMEDRIVER_RELEASE}/linux64/chromedriver-linux64.zip"
     unzip ${CHROMEDRIVER_ZIP} -d /tmp/
     mv /tmp/chromedriver-linux64/chromedriver /usr/bin/
     chmod +x /usr/bin/chromedriver

From d6dc1e3984ff170104e9acb7b95c283a88267f78 Mon Sep 17 00:00:00 2001
From: Aaron van Meerten <aaron.van.meerten@gmail.com>
Date: Tue, 20 Feb 2024 08:39:09 -0600
Subject: [PATCH 11/32] base-java: install nodejs 20 from nodesource

* base-java: install nodejs 20 from nodesource

* jibri: bump chrome version

* Revert chrome version
---
 base-java/Dockerfile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/base-java/Dockerfile b/base-java/Dockerfile
index c28dc6043b..8fd21f3fbe 100644
--- a/base-java/Dockerfile
+++ b/base-java/Dockerfile
@@ -3,6 +3,11 @@ ARG BASE_TAG=latest
 FROM ${JITSI_REPO}/base:${BASE_TAG}
 
 RUN mkdir -p /usr/share/man/man1 && \
+    mkdir -p /etc/apt/keyrings/ && \
     apt-dpkg-wrap apt-get update && \
-    apt-dpkg-wrap apt-get install -y openjdk-11-jre-headless openjdk-11-jdk-headless && \
+    apt-dpkg-wrap apt-get install -y unzip ca-certificates curl gnupg && \
+    curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
+    echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
+    apt-dpkg-wrap apt-get update && \
+    apt-dpkg-wrap apt-get install -y nodejs openjdk-11-jre-headless openjdk-11-jdk-headless && \
     apt-cleanup

From 33350c3a1564748e02d5b3977e3a3abf67856f93 Mon Sep 17 00:00:00 2001
From: Sebastian Denz <github@ixyd.net>
Date: Wed, 21 Feb 2024 13:45:49 +0100
Subject: [PATCH 12/32] prosody: fix env var default value

---
 prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua | 4 ++--
 prosody/rootfs/defaults/conf.d/visitors.cfg.lua   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua b/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua
index 84d9c0bb39..bfe5b38bf6 100644
--- a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua
+++ b/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua
@@ -378,11 +378,11 @@ Component "{{ $XMPP_MUC_DOMAIN }}" "muc"
     {{ join "\n    " (splitList "," .Env.XMPP_MUC_CONFIGURATION) }}
     {{ end -}}
     {{ if .Env.MAX_PARTICIPANTS }}
-    muc_access_whitelist = { "focus@{{ .Env.XMPP_AUTH_DOMAIN }}" }
+    muc_access_whitelist = { "focus@{{ $XMPP_AUTH_DOMAIN }}" }
     muc_max_occupants = "{{ .Env.MAX_PARTICIPANTS }}"
     {{ end }}
     muc_password_whitelist = {
-        "focus@{{ .Env.XMPP_AUTH_DOMAIN }}";
+        "focus@{{ $XMPP_AUTH_DOMAIN }}";
 {{- if $ENABLE_RECORDING }}
         "{{ $JIBRI_RECORDER_USER }}@{{ $XMPP_RECORDER_DOMAIN }}";
 {{- end }}
diff --git a/prosody/rootfs/defaults/conf.d/visitors.cfg.lua b/prosody/rootfs/defaults/conf.d/visitors.cfg.lua
index 843b74cf97..9534183fb5 100644
--- a/prosody/rootfs/defaults/conf.d/visitors.cfg.lua
+++ b/prosody/rootfs/defaults/conf.d/visitors.cfg.lua
@@ -130,7 +130,7 @@ VirtualHost 'v{{ $VISITOR_INDEX }}.{{ $VISITORS_XMPP_DOMAIN }}'
     {{ join "\n    " (splitList "," .Env.XMPP_CONFIGURATION) }}
     {{- end }}
 
-VirtualHost '{{ $XMPP_AUTH_DOMAIN}}'
+VirtualHost '{{ $XMPP_AUTH_DOMAIN }}'
     modules_enabled = {
       'limits_exception';
     }

From 28f3cf8b64ab5fb97b5f0b7ed97ccc50178ea4e4 Mon Sep 17 00:00:00 2001
From: Aaron van Meerten <aaron.van.meerten@gmail.com>
Date: Wed, 21 Feb 2024 11:59:56 -0600
Subject: [PATCH 13/32] jvb: lipcap from apt to allow for pcap dumps (#1747)

---
 jvb/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jvb/Dockerfile b/jvb/Dockerfile
index 488ad4358b..036f83bd24 100644
--- a/jvb/Dockerfile
+++ b/jvb/Dockerfile
@@ -9,7 +9,7 @@ LABEL org.opencontainers.image.source="https://github.com/jitsi/docker-jitsi-mee
 LABEL org.opencontainers.image.documentation="https://jitsi.github.io/handbook/"
 
 RUN apt-dpkg-wrap apt-get update && \
-    apt-dpkg-wrap apt-get install -y jitsi-videobridge2 jitsi-autoscaler-sidecar jq curl iproute2 dnsutils && \
+    apt-dpkg-wrap apt-get install -y jitsi-videobridge2 jitsi-autoscaler-sidecar jq curl iproute2 dnsutils libpcap0.8 && \
     apt-cleanup
 
 COPY rootfs/ /

From 590a611373bb7edc2d02a520d083092b46e0bc52 Mon Sep 17 00:00:00 2001
From: Ben Banfield-Zanin <benbz@matrix.org>
Date: Wed, 28 Feb 2024 16:55:17 +0000
Subject: [PATCH 14/32] Build the excalidraw backend

---
 .github/workflows/docker-publish-individual.yml | 16 ++++++++++++++++
 .github/workflows/docker-publish.yml            |  9 +++++++++
 2 files changed, 25 insertions(+)

diff --git a/.github/workflows/docker-publish-individual.yml b/.github/workflows/docker-publish-individual.yml
index b2f0e1f028..0e400cbbd8 100644
--- a/.github/workflows/docker-publish-individual.yml
+++ b/.github/workflows/docker-publish-individual.yml
@@ -6,6 +6,14 @@ on:
       folder:
         required: true
         type: string
+      repository:
+        required: false
+        type: string
+        default: ""
+      ref:
+        required: false
+        type: string
+        default: ""
     secrets:
       github-token:
         required: true
@@ -27,6 +35,14 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v3
 
+    - name: Checkout other repository
+      uses: actions/checkout@v3
+      with:
+        repository: ${{ inputs.repository }}
+        ref: ${{ inputs.ref }}
+        path: ${{ inputs.folder }}
+      if: ${{ inputs.repository != '' }}
+
     - name: Log into registry ${{ env.REGISTRY }}
       uses: docker/login-action@v2
       with:
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 93b46d993a..f3892fe97c 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -84,3 +84,12 @@ jobs:
       folder: web
     secrets:
       github-token: ${{ secrets.GITHUB_TOKEN }}
+
+  build-push-excalidraw:
+    uses: ./.github/workflows/docker-publish-individual.yml
+    with:
+      folder: excalidraw-backend
+      repository: jitsi/excalidraw-backend
+      ref: "x21"
+    secrets:
+      github-token: ${{ secrets.GITHUB_TOKEN }}

From 76809610a1fb2e9c19d16b4d9f1d0e37593e90f2 Mon Sep 17 00:00:00 2001
From: Kurt Garloff <kurt@garloff.de>
Date: Sun, 18 Feb 2024 14:32:05 +0100
Subject: [PATCH 15/32] jibri: use storage.googleapis.com location for
 chromedriver

This is the place listed on
https://googlechromelabs.github.io/chrome-for-testing/
which would seem to be the least likely to silently break.
Currently, the edgedl.me.gvt1.com location is broken.

Signed-off-by: Kurt Garloff <kurt@garloff.de>
---
 jibri/rootfs/usr/bin/install-chrome.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jibri/rootfs/usr/bin/install-chrome.sh b/jibri/rootfs/usr/bin/install-chrome.sh
index b8fe139b56..9b89e1a4f0 100755
--- a/jibri/rootfs/usr/bin/install-chrome.sh
+++ b/jibri/rootfs/usr/bin/install-chrome.sh
@@ -33,7 +33,7 @@ else
     fi
 
     CHROMEDRIVER_ZIP="/tmp/chromedriver_linux64.zip"
-    curl -4Lso ${CHROMEDRIVER_ZIP} "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/${CHROMEDRIVER_RELEASE}/linux64/chromedriver-linux64.zip"
+    curl -4Lso ${CHROMEDRIVER_ZIP} "https://storage.googleapis.com/chrome-for-testing-public/${CHROMEDRIVER_RELEASE}/linux64/chromedriver-linux64.zip"
     unzip ${CHROMEDRIVER_ZIP} -d /tmp/
     mv /tmp/chromedriver-linux64/chromedriver /usr/bin/
     chmod +x /usr/bin/chromedriver

From 648612f1bcfd8688547a97fd74f69da83e33b5b2 Mon Sep 17 00:00:00 2001
From: damencho <damencho@jitsi.org>
Date: Mon, 4 Mar 2024 13:08:50 -0600
Subject: [PATCH 16/32] feat(prosody): Always report visitors support when
 enabled.

---
 prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua b/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua
index bfe5b38bf6..8d0beeafd0 100644
--- a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua
+++ b/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua
@@ -464,4 +464,5 @@ Component "metadata.{{ $XMPP_DOMAIN }}" "room_metadata_component"
 {{ if $ENABLE_VISITORS }}
 Component "visitors.{{ $XMPP_DOMAIN }}" "visitors_component"
     auto_allow_visitor_promotion = true
+    always_visitors_enabled = true
 {{ end }}

From 140db223e35a3ec5a34a2e8559f52e3259f411c2 Mon Sep 17 00:00:00 2001
From: Aaron van Meerten <aaron.van.meerten@gmail.com>
Date: Tue, 12 Mar 2024 12:55:39 -0500
Subject: [PATCH 17/32] jibri: check for chrome bin before pre-warm (#1757)

---
 jibri/rootfs/etc/services.d/40-jibri/run | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/jibri/rootfs/etc/services.d/40-jibri/run b/jibri/rootfs/etc/services.d/40-jibri/run
index f62ce24d34..fe481819e0 100644
--- a/jibri/rootfs/etc/services.d/40-jibri/run
+++ b/jibri/rootfs/etc/services.d/40-jibri/run
@@ -4,7 +4,9 @@
 HOME=/home/jibri
 
 DAEMON=/opt/jitsi/jibri/launch.sh
+CHROME_BIN_PATH="$(which google-chrome)"
+[ $? -ne 0 ] && CHROME_BIN_PATH="$(which chromium)"
 # pre-warm google chrome before jibri launches to ensure fast chrome launch during recordings
-s6-setuidgid jibri /usr/bin/google-chrome --timeout=1000 --headless about:blank
+[ -n "$CHROME_BIN_PATH" ] && s6-setuidgid jibri $CHROME_BIN_PATH --timeout=1000 --headless about:blank
 exec s6-setuidgid jibri /bin/bash -c "exec $DAEMON"
 

From 615396e1f02494385fd1b927f8e29d612c615720 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <saghul@jitsi.org>
Date: Mon, 18 Mar 2024 15:45:21 +0100
Subject: [PATCH 18/32] java: use Java 17

---
 base-java/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base-java/Dockerfile b/base-java/Dockerfile
index 8fd21f3fbe..9bd9389a0e 100644
--- a/base-java/Dockerfile
+++ b/base-java/Dockerfile
@@ -9,5 +9,5 @@ RUN mkdir -p /usr/share/man/man1 && \
     curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
     echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
     apt-dpkg-wrap apt-get update && \
-    apt-dpkg-wrap apt-get install -y nodejs openjdk-11-jre-headless openjdk-11-jdk-headless && \
+    apt-dpkg-wrap apt-get install -y nodejs openjdk-17-jre-headless openjdk-17-jdk-headless && \
     apt-cleanup

From ca61ea20b0a4fcc79862026623ec4f11d122a7e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <s@saghul.net>
Date: Mon, 18 Mar 2024 15:18:01 +0100
Subject: [PATCH 19/32] jibri: add ability to ignore certificate errors

This is useful for testing without a valid TLS certificate.
---
 jibri.yml                        |  1 +
 jibri/rootfs/defaults/jibri.conf | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/jibri.yml b/jibri.yml
index a0b4937dbe..057a45e0c2 100644
--- a/jibri.yml
+++ b/jibri.yml
@@ -23,6 +23,7 @@ services:
             - CHROMIUM_FLAGS
             - DISPLAY=:0
             - ENABLE_STATS_D
+            - IGNORE_CERTIFICATE_ERRORS
             - JIBRI_WEBHOOK_SUBSCRIBERS
             - JIBRI_INSTANCE_ID
             - JIBRI_HTTP_API_EXTERNAL_PORT
diff --git a/jibri/rootfs/defaults/jibri.conf b/jibri/rootfs/defaults/jibri.conf
index 5881d01bb9..ac357a8ec8 100644
--- a/jibri/rootfs/defaults/jibri.conf
+++ b/jibri/rootfs/defaults/jibri.conf
@@ -141,6 +141,17 @@ jibri {
         "{{ join "\",\"" (splitList "," .Env.CHROMIUM_FLAGS) }}"
       ]
     }
+    {{ else if .Env.IGNORE_CERTIFICATE_ERRORS -}}
+    chrome {
+      flags = [
+        "--use-fake-ui-for-media-stream",
+        "--start-maximized",
+        "--kiosk",
+        "--enabled",
+        "--autoplay-policy=no-user-gesture-required",
+        "--ignore-certificate-errors"
+      ]
+    }
     {{ end -}}
 
     {{ if .Env.ENABLE_STATS_D -}}

From 36ebd3df96a03da1473aecf66935d83884e9213f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <s@saghul.net>
Date: Mon, 18 Mar 2024 22:04:53 +0100
Subject: [PATCH 20/32] release: stable-9364

* ca61ea2 jibri: add ability to ignore certificate errors
* 615396e java: use Java 17
* 140db22 jibri: check for chrome bin before pre-warm (#1757)
* 648612f feat(prosody): Always report visitors support when enabled.
* 28f3cf8 jvb: lipcap from apt to allow for pcap dumps (#1747)
* 33350c3 prosody: fix env var default value
* d6dc1e3 base-java: install nodejs 20 from nodesource
* 8f84f2f jibri: use storage.googleapis.com location for chromedriver
* 1bbb4ab fix(prosody): Updates a rate whitelist config that changed in jitsi-meet. (#1741)
* eccf68e misc: working on unstable
---
 CHANGELOG.md       | 15 +++++++++++++++
 docker-compose.yml |  8 ++++----
 jibri.yml          |  2 +-
 jigasi.yml         |  2 +-
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2174a1cda..090be7556e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,18 @@
+## stable-9364
+
+Based on stable release 9364.
+
+* ca61ea2 jibri: add ability to ignore certificate errors
+* 615396e java: use Java 17
+* 140db22 jibri: check for chrome bin before pre-warm (#1757)
+* 648612f feat(prosody): Always report visitors support when enabled.
+* 28f3cf8 jvb: lipcap from apt to allow for pcap dumps (#1747)
+* 33350c3 prosody: fix env var default value
+* d6dc1e3 base-java: install nodejs 20 from nodesource
+* 8f84f2f jibri: use storage.googleapis.com location for chromedriver
+* 1bbb4ab fix(prosody): Updates a rate whitelist config that changed in jitsi-meet. (#1741)
+* eccf68e misc: working on unstable
+
 ## stable-9258
 
 Based on stable release 9258.
diff --git a/docker-compose.yml b/docker-compose.yml
index c4fce69e95..29288c7718 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.5'
 services:
     # Frontend
     web:
-        image: jitsi/web:${JITSI_IMAGE_VERSION:-unstable}
+        image: jitsi/web:${JITSI_IMAGE_VERSION:-stable-9364}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '${HTTP_PORT}:80'
@@ -179,7 +179,7 @@ services:
 
     # XMPP server
     prosody:
-        image: jitsi/prosody:${JITSI_IMAGE_VERSION:-unstable}
+        image: jitsi/prosody:${JITSI_IMAGE_VERSION:-stable-9364}
         restart: ${RESTART_POLICY:-unless-stopped}
         expose:
             - '${XMPP_PORT:-5222}'
@@ -311,7 +311,7 @@ services:
 
     # Focus component
     jicofo:
-        image: jitsi/jicofo:${JITSI_IMAGE_VERSION:-unstable}
+        image: jitsi/jicofo:${JITSI_IMAGE_VERSION:-stable-9364}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '127.0.0.1:${JICOFO_REST_PORT:-8888}:8888'
@@ -393,7 +393,7 @@ services:
 
     # Video bridge
     jvb:
-        image: jitsi/jvb:${JITSI_IMAGE_VERSION:-unstable}
+        image: jitsi/jvb:${JITSI_IMAGE_VERSION:-stable-9364}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '${JVB_PORT:-10000}:${JVB_PORT:-10000}/udp'
diff --git a/jibri.yml b/jibri.yml
index 057a45e0c2..48ca9f1c76 100644
--- a/jibri.yml
+++ b/jibri.yml
@@ -2,7 +2,7 @@ version: '3.5'
 
 services:
     jibri:
-        image: jitsi/jibri:${JITSI_IMAGE_VERSION:-unstable}
+        image: jitsi/jibri:${JITSI_IMAGE_VERSION:-stable-9364}
         restart: ${RESTART_POLICY:-unless-stopped}
         volumes:
             - ${CONFIG}/jibri:/config:Z
diff --git a/jigasi.yml b/jigasi.yml
index 210d5916cc..48173aecf9 100644
--- a/jigasi.yml
+++ b/jigasi.yml
@@ -3,7 +3,7 @@ version: '3.5'
 services:
     # SIP gateway (audio)
     jigasi:
-        image: jitsi/jigasi:${JITSI_IMAGE_VERSION:-unstable}
+        image: jitsi/jigasi:${JITSI_IMAGE_VERSION:-stable-9364}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '${JIGASI_PORT_MIN:-20000}-${JIGASI_PORT_MAX:-20050}:${JIGASI_PORT_MIN:-20000}-${JIGASI_PORT_MAX:-20050}/udp'

From 452f5ba26c8d6b2d3bcf62efe3fa6f1fddbcfcbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <s@saghul.net>
Date: Mon, 18 Mar 2024 22:04:53 +0100
Subject: [PATCH 21/32] misc: working on unstable

---
 docker-compose.yml | 8 ++++----
 jibri.yml          | 2 +-
 jigasi.yml         | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 29288c7718..c4fce69e95 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.5'
 services:
     # Frontend
     web:
-        image: jitsi/web:${JITSI_IMAGE_VERSION:-stable-9364}
+        image: jitsi/web:${JITSI_IMAGE_VERSION:-unstable}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '${HTTP_PORT}:80'
@@ -179,7 +179,7 @@ services:
 
     # XMPP server
     prosody:
-        image: jitsi/prosody:${JITSI_IMAGE_VERSION:-stable-9364}
+        image: jitsi/prosody:${JITSI_IMAGE_VERSION:-unstable}
         restart: ${RESTART_POLICY:-unless-stopped}
         expose:
             - '${XMPP_PORT:-5222}'
@@ -311,7 +311,7 @@ services:
 
     # Focus component
     jicofo:
-        image: jitsi/jicofo:${JITSI_IMAGE_VERSION:-stable-9364}
+        image: jitsi/jicofo:${JITSI_IMAGE_VERSION:-unstable}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '127.0.0.1:${JICOFO_REST_PORT:-8888}:8888'
@@ -393,7 +393,7 @@ services:
 
     # Video bridge
     jvb:
-        image: jitsi/jvb:${JITSI_IMAGE_VERSION:-stable-9364}
+        image: jitsi/jvb:${JITSI_IMAGE_VERSION:-unstable}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '${JVB_PORT:-10000}:${JVB_PORT:-10000}/udp'
diff --git a/jibri.yml b/jibri.yml
index 48ca9f1c76..057a45e0c2 100644
--- a/jibri.yml
+++ b/jibri.yml
@@ -2,7 +2,7 @@ version: '3.5'
 
 services:
     jibri:
-        image: jitsi/jibri:${JITSI_IMAGE_VERSION:-stable-9364}
+        image: jitsi/jibri:${JITSI_IMAGE_VERSION:-unstable}
         restart: ${RESTART_POLICY:-unless-stopped}
         volumes:
             - ${CONFIG}/jibri:/config:Z
diff --git a/jigasi.yml b/jigasi.yml
index 48173aecf9..210d5916cc 100644
--- a/jigasi.yml
+++ b/jigasi.yml
@@ -3,7 +3,7 @@ version: '3.5'
 services:
     # SIP gateway (audio)
     jigasi:
-        image: jitsi/jigasi:${JITSI_IMAGE_VERSION:-stable-9364}
+        image: jitsi/jigasi:${JITSI_IMAGE_VERSION:-unstable}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '${JIGASI_PORT_MIN:-20000}-${JIGASI_PORT_MAX:-20050}:${JIGASI_PORT_MIN:-20000}-${JIGASI_PORT_MAX:-20050}/udp'

From 360361e5ea40ba509cae94ca7c33aa9304410ed8 Mon Sep 17 00:00:00 2001
From: Aaron van Meerten <aaron.van.meerten@gmail.com>
Date: Tue, 19 Mar 2024 07:46:34 -0500
Subject: [PATCH 22/32] jibri: move xmpp config for easier override (#1748)

* jibri: move xmpp config for easier override

* fix order of operations
---
 jibri/rootfs/defaults/jibri.conf       | 80 +-------------------------
 jibri/rootfs/defaults/xmpp.conf        | 77 +++++++++++++++++++++++++
 jibri/rootfs/etc/cont-init.d/10-config |  1 +
 3 files changed, 80 insertions(+), 78 deletions(-)
 create mode 100644 jibri/rootfs/defaults/xmpp.conf

diff --git a/jibri/rootfs/defaults/jibri.conf b/jibri/rootfs/defaults/jibri.conf
index ac357a8ec8..993052f34b 100644
--- a/jibri/rootfs/defaults/jibri.conf
+++ b/jibri/rootfs/defaults/jibri.conf
@@ -1,29 +1,12 @@
-{{ $JIBRI_XMPP_USER := .Env.JIBRI_XMPP_USER | default "jibri" -}}
-{{ $JIBRI_RECORDER_USER := .Env.JIBRI_RECORDER_USER | default "recorder" -}}
-{{ $JIBRI_USAGE_TIMEOUT := .Env.JIBRI_USAGE_TIMEOUT | default "0" -}}
 {{ $JIBRI_RECORDING_RESOLUTION := .Env.JIBRI_RECORDING_RESOLUTION | default "1280x720" -}}
 {{ $JIBRI_RECORDING_VIDEO_ENCODE_PRESET := .Env.JIBRI_RECORDING_VIDEO_ENCODE_PRESET | default "veryfast" -}}
 {{ $JIBRI_RECORDING_CONSTANT_RATE_FACTOR := .Env.JIBRI_RECORDING_CONSTANT_RATE_FACTOR | default 25 -}}
 {{ $JIBRI_RECORDING_FRAMERATE := .Env.JIBRI_RECORDING_FRAMERATE | default 30 -}}
 {{ $JIBRI_RECORDING_QUEUE_SIZE := .Env.JIBRI_RECORDING_QUEUE_SIZE | default 4096 -}}
 {{ $JIBRI_RECORDING_STREAMING_MAX_BITRATE := .Env.JIBRI_RECORDING_STREAMING_MAX_BITRATE | default 2976 -}}
-{{ $JIBRI_BREWERY_MUC := .Env.JIBRI_BREWERY_MUC | default "jibribrewery" -}}
 {{ $JIBRI_SINGLE_USE_MODE := .Env.JIBRI_SINGLE_USE_MODE | default "false" -}}
-{{ $XMPP_AUTH_DOMAIN := .Env.XMPP_AUTH_DOMAIN | default "auth.meet.jitsi" -}}
-{{ $XMPP_DOMAIN := .Env.XMPP_DOMAIN | default "meet.jitsi" -}}
-{{ $XMPP_INTERNAL_MUC_DOMAIN := .Env.XMPP_INTERNAL_MUC_DOMAIN | default "internal-muc.meet.jitsi" -}}
-{{ $XMPP_MUC_DOMAIN := .Env.XMPP_MUC_DOMAIN | default "muc.meet.jitsi" -}}
-{{ $XMPP_MUC_DOMAIN_PREFIX := (split "." $XMPP_MUC_DOMAIN)._0  -}}
-{{ $JIBRI_STRIP_DOMAIN_JID := .Env.JIBRI_STRIP_DOMAIN_JID | default $XMPP_MUC_DOMAIN_PREFIX -}}
-{{ $XMPP_RECORDER_DOMAIN := .Env.XMPP_RECORDER_DOMAIN | default "recorder.meet.jitsi" -}}
-{{ $XMPP_TRUST_ALL_CERTS := .Env.XMPP_TRUST_ALL_CERTS | default "true" | toBool -}}
-{{ $XMPP_PORT := .Env.XMPP_PORT | default "5222" -}}
-{{ $XMPP_SERVER := .Env.XMPP_SERVER | default "xmpp.meet.jitsi" -}}
-{{ $XMPP_SERVERS := splitList "," $XMPP_SERVER -}}
 {{ $STATSD_HOST := .Env.JIBRI_STATSD_HOST | default "localhost" -}}
 {{ $STATSD_PORT := .Env.JIBRI_STATSD_PORT | default "8125" -}}
-{{/* assign env from context, preserve during range when . is re-assigned */}}
-{{ $ENV := .Env -}}
 
 jibri {
     // A unique identifier for this Jibri
@@ -45,67 +28,6 @@ jibri {
         {{ end -}}
       }
       {{ end -}}
-      xmpp {
-        // See example_xmpp_envs.conf for an example of what is expected here
-        environments = [
-{{ range $index, $element := $XMPP_SERVERS -}}
-{{ $SERVER := splitn ":" 2 $element }}
-            {
-                // A user-friendly name for this environment
-                name = "{{ $ENV.XMPP_ENV_NAME }}-{{$index}}"
-
-                // A list of XMPP server hosts to which we'll connect
-                xmpp-server-hosts = [
-                    "{{ $SERVER._0 }}"
-                ]
-
-                // The base XMPP domain
-                xmpp-domain = "{{ $XMPP_DOMAIN }}"
-
-                {{ if $ENV.PUBLIC_URL -}}
-                // An (optional) base url the Jibri will join if it is set
-                base-url = "{{ $ENV.PUBLIC_URL }}"
-                {{ end -}}
-
-                // The MUC we'll join to announce our presence for
-                // recording and streaming services
-                control-muc {
-                    domain = "{{ $XMPP_INTERNAL_MUC_DOMAIN }}"
-                    room-name = "{{ $JIBRI_BREWERY_MUC }}"
-                    nickname = "{{ $ENV.JIBRI_INSTANCE_ID }}"
-                }
-
-                // The login information for the control MUC
-                control-login {
-                    domain = "{{ $XMPP_AUTH_DOMAIN }}"
-                    port = "{{ $SERVER._1 | default $XMPP_PORT }}"
-                    username = "{{ $JIBRI_XMPP_USER }}"
-                    password = "{{ $ENV.JIBRI_XMPP_PASSWORD }}"
-                }
-
-                // The login information the selenium web client will use
-                call-login {
-                    domain = "{{ $XMPP_RECORDER_DOMAIN }}"
-                    username = "{{ $JIBRI_RECORDER_USER }}"
-                    password = "{{ $ENV.JIBRI_RECORDER_PASSWORD }}"
-                }
-
-                // The value we'll strip from the room JID domain to derive
-                // the call URL
-                strip-from-room-domain = "{{ $JIBRI_STRIP_DOMAIN_JID }}."
-
-                // How long Jibri sessions will be allowed to last before
-                // they are stopped.  A value of 0 allows them to go on
-                // indefinitely
-                usage-timeout = "{{ $JIBRI_USAGE_TIMEOUT }}"
-
-                // Whether or not we'll automatically trust any cert on
-                // this XMPP domain
-                trust-all-xmpp-certs = {{ $XMPP_TRUST_ALL_CERTS }}
-            }
-{{ end }}
-        ]
-      }
     }
     recording {
       recordings-directory = "{{ .Env.JIBRI_RECORDING_DIR | default "/config/recordings" }}"
@@ -162,3 +84,5 @@ jibri {
     }
     {{ end -}}
 }
+
+include "xmpp.conf"
diff --git a/jibri/rootfs/defaults/xmpp.conf b/jibri/rootfs/defaults/xmpp.conf
new file mode 100644
index 0000000000..c8e58f35c2
--- /dev/null
+++ b/jibri/rootfs/defaults/xmpp.conf
@@ -0,0 +1,77 @@
+{{ $JIBRI_BREWERY_MUC := .Env.JIBRI_BREWERY_MUC | default "jibribrewery" -}}
+{{ $XMPP_MUC_DOMAIN := .Env.XMPP_MUC_DOMAIN | default "muc.meet.jitsi" -}}
+{{ $XMPP_MUC_DOMAIN_PREFIX := (split "." $XMPP_MUC_DOMAIN)._0  -}}
+{{ $JIBRI_STRIP_DOMAIN_JID := .Env.JIBRI_STRIP_DOMAIN_JID | default $XMPP_MUC_DOMAIN_PREFIX -}}
+{{ $JIBRI_RECORDER_USER := .Env.JIBRI_RECORDER_USER | default "recorder" -}}
+{{ $JIBRI_USAGE_TIMEOUT := .Env.JIBRI_USAGE_TIMEOUT | default "0" -}}
+{{ $JIBRI_XMPP_USER := .Env.JIBRI_XMPP_USER | default "jibri" -}}
+{{ $XMPP_AUTH_DOMAIN := .Env.XMPP_AUTH_DOMAIN | default "auth.meet.jitsi" -}}
+{{ $XMPP_DOMAIN := .Env.XMPP_DOMAIN | default "meet.jitsi" -}}
+{{ $XMPP_INTERNAL_MUC_DOMAIN := .Env.XMPP_INTERNAL_MUC_DOMAIN | default "internal-muc.meet.jitsi" -}}
+{{ $XMPP_RECORDER_DOMAIN := .Env.XMPP_RECORDER_DOMAIN | default "recorder.meet.jitsi" -}}
+{{ $XMPP_TRUST_ALL_CERTS := .Env.XMPP_TRUST_ALL_CERTS | default "true" | toBool -}}
+{{ $XMPP_PORT := .Env.XMPP_PORT | default "5222" -}}
+{{ $XMPP_SERVER := .Env.XMPP_SERVER | default "xmpp.meet.jitsi" -}}
+{{ $XMPP_SERVERS := splitList "," $XMPP_SERVER -}}
+{{/* assign env from context, preserve during range when . is re-assigned */}}
+{{ $ENV := .Env -}}
+
+jibri.api.xmpp.environments = [
+    // See example_xmpp_envs.conf for an example of what is expected here
+{{ range $index, $element := $XMPP_SERVERS -}}
+{{ $SERVER := splitn ":" 2 $element }}
+            {
+                // A user-friendly name for this environment
+                name = "{{ $ENV.XMPP_ENV_NAME }}-{{$index}}"
+
+                // A list of XMPP server hosts to which we'll connect
+                xmpp-server-hosts = [
+                    "{{ $SERVER._0 }}"
+                ]
+
+                // The base XMPP domain
+                xmpp-domain = "{{ $XMPP_DOMAIN }}"
+
+                {{ if $ENV.PUBLIC_URL -}}
+                // An (optional) base url the Jibri will join if it is set
+                base-url = "{{ $ENV.PUBLIC_URL }}"
+                {{ end -}}
+
+                // The MUC we'll join to announce our presence for
+                // recording and streaming services
+                control-muc {
+                    domain = "{{ $XMPP_INTERNAL_MUC_DOMAIN }}"
+                    room-name = "{{ $JIBRI_BREWERY_MUC }}"
+                    nickname = "{{ $ENV.JIBRI_INSTANCE_ID }}"
+                }
+
+                // The login information for the control MUC
+                control-login {
+                    domain = "{{ $XMPP_AUTH_DOMAIN }}"
+                    port = "{{ $SERVER._1 | default $XMPP_PORT }}"
+                    username = "{{ $JIBRI_XMPP_USER }}"
+                    password = "{{ $ENV.JIBRI_XMPP_PASSWORD }}"
+                }
+
+                // The login information the selenium web client will use
+                call-login {
+                    domain = "{{ $XMPP_RECORDER_DOMAIN }}"
+                    username = "{{ $JIBRI_RECORDER_USER }}"
+                    password = "{{ $ENV.JIBRI_RECORDER_PASSWORD }}"
+                }
+
+                // The value we'll strip from the room JID domain to derive
+                // the call URL
+                strip-from-room-domain = "{{ $JIBRI_STRIP_DOMAIN_JID }}."
+
+                // How long Jibri sessions will be allowed to last before
+                // they are stopped.  A value of 0 allows them to go on
+                // indefinitely
+                usage-timeout = "{{ $JIBRI_USAGE_TIMEOUT }}"
+
+                // Whether or not we'll automatically trust any cert on
+                // this XMPP domain
+                trust-all-xmpp-certs = {{ $XMPP_TRUST_ALL_CERTS }}
+            }
+{{ end }}
+]
diff --git a/jibri/rootfs/etc/cont-init.d/10-config b/jibri/rootfs/etc/cont-init.d/10-config
index 9d3b1f517b..7f9a0ceb87 100644
--- a/jibri/rootfs/etc/cont-init.d/10-config
+++ b/jibri/rootfs/etc/cont-init.d/10-config
@@ -69,6 +69,7 @@ fi
 
 # always recreate configs
 tpl /defaults/jibri.conf > /etc/jitsi/jibri/jibri.conf
+tpl /defaults/xmpp.conf > /etc/jitsi/jibri/xmpp.conf
 tpl /defaults/logging.properties > /etc/jitsi/jibri/logging.properties
 tpl /defaults/xorg-video-dummy.conf > /etc/jitsi/jibri/xorg-video-dummy.conf
 

From ca1d6704f935b9f688f0671ea0b5fafa18ee28cc Mon Sep 17 00:00:00 2001
From: HannesOberreiter <hoberreiter@gmail.com>
Date: Tue, 19 Mar 2024 16:24:05 +0100
Subject: [PATCH 23/32] fix: :bug: wrong quote in default config (#1761)

---
 web/rootfs/defaults/system-config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/rootfs/defaults/system-config.js b/web/rootfs/defaults/system-config.js
index b680acf40a..a4a5ed5524 100644
--- a/web/rootfs/defaults/system-config.js
+++ b/web/rootfs/defaults/system-config.js
@@ -22,7 +22,7 @@ config.focusUserJid = 'focus@{{$XMPP_AUTH_DOMAIN}}';
 
 {{ if $ENABLE_SUBDOMAINS -}}
 var subdir = '<!--# echo var="subdir" default="" -->';
-var subdomain = "<!--# echo var="subdomain" default="" -->";
+var subdomain = '<!--# echo var="subdomain" default="" -->';
 if (subdir.startsWith('<!--')) {
     subdir = '';
 }

From 0953ca0853223f268f1c1ea7e55a315ebb492326 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <s@saghul.net>
Date: Mon, 18 Mar 2024 21:40:45 +0100
Subject: [PATCH 24/32] jigasi: skip SIP configuration when configured as a
 transcriber

---
 jigasi/rootfs/defaults/sip-communicator.properties | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/jigasi/rootfs/defaults/sip-communicator.properties b/jigasi/rootfs/defaults/sip-communicator.properties
index a13e49bc97..0f30c71abc 100644
--- a/jigasi/rootfs/defaults/sip-communicator.properties
+++ b/jigasi/rootfs/defaults/sip-communicator.properties
@@ -1,3 +1,4 @@
+{{ $ENABLE_TRANSCRIPTIONS := .Env.ENABLE_TRANSCRIPTIONS | default "0" | toBool -}}
 {{ $JIGASI_BREWERY_MUC := .Env.JIGASI_BREWERY_MUC | default "jigasibrewery" -}}
 {{ $JIGASI_XMPP_USER := .Env.JIGASI_XMPP_USER | default "jigasi" -}}
 {{ $XMPP_AUTH_DOMAIN := .Env.XMPP_AUTH_DOMAIN | default "auth.meet.jitsi" -}}
@@ -24,6 +25,7 @@ net.java.sip.communicator.packetlogging.PACKET_LOGGING_ENABLED=false
 # Control REST Shutdown
 org.jitsi.jigasi.ENABLE_REST_SHUTDOWN={{ $SHUTDOWN_REST_ENABLED }}
 
+{{ if not $ENABLE_TRANSCRIPTIONS -}}
 # SIP account
 net.java.sip.communicator.impl.protocol.sip.acc1=acc1
 {{ if .Env.JIGASI_SIP_SERVER }}
@@ -77,6 +79,7 @@ net.java.sip.communicator.impl.protocol.sip.acc1.Encodings.telephone-event/8000=
 net.java.sip.communicator.impl.protocol.sip.acc1.Encodings.ulpfec/90000=0
 net.java.sip.communicator.impl.protocol.sip.acc1.OVERRIDE_ENCODINGS=true
 net.java.sip.communicator.impl.protocol.sip.acc1.DOMAIN_BASE={{ $XMPP_DOMAIN }}
+{{ end -}}
 
 # XMPP account used for control
 
@@ -156,7 +159,7 @@ org.jitsi.jigasi.xmpp.acc.ALLOW_NON_SECURE=true
 # remote certificates always.
 net.java.sip.communicator.service.gui.ALWAYS_TRUST_MODE_ENABLED=true
 
-{{ if .Env.ENABLE_TRANSCRIPTIONS | default "0" | toBool }}
+{{ if $ENABLE_TRANSCRIPTIONS -}}
 # Transcription config
 org.jitsi.jigasi.ENABLE_TRANSCRIPTION=true
 org.jitsi.jigasi.transcription.ENABLE_TRANSLATION=true
@@ -170,7 +173,7 @@ org.jitsi.jigasi.transcription.SAVE_TXT=true
 org.jitsi.jigasi.transcription.SEND_TXT={{ .Env.JIGASI_TRANSCRIBER_SEND_TXT | default "false"}}
 org.jitsi.jigasi.transcription.RECORD_AUDIO={{ .Env.JIGASI_TRANSCRIBER_RECORD_AUDIO | default "false"}}
 org.jitsi.jigasi.transcription.RECORD_AUDIO_FORMAT=wav
-{{end}}
+{{ end -}}
 
 {{ if .Env.JIGASI_SIP_DEFAULT_ROOM }}
 org.jitsi.jigasi.DEFAULT_JVB_ROOM_NAME={{ .Env.JIGASI_SIP_DEFAULT_ROOM }}

From d5df19d30f8f8d2144ab37dbc1e7a3bb24c76666 Mon Sep 17 00:00:00 2001
From: Aaron van Meerten <aaron.van.meerten@gmail.com>
Date: Wed, 20 Mar 2024 12:22:08 -0500
Subject: [PATCH 25/32] jigasi: autoscaler sidecar support (#1738)

* jigasi: autoscaler sidecar support

* jigasi: remove local address
---
 jigasi.yml                                    | 11 +++++++
 jigasi/Dockerfile                             |  2 +-
 .../rootfs/defaults/autoscaler-sidecar.config | 18 +++++++++++
 jigasi/rootfs/etc/cont-init.d/10-config       | 32 +++++++++++++++++++
 .../etc/services.d/50-autoscaler-sidecar/run  | 10 ++++++
 jigasi/rootfs/etc/services.d/jigasi/run       |  5 ++-
 6 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 jigasi/rootfs/defaults/autoscaler-sidecar.config
 create mode 100644 jigasi/rootfs/etc/services.d/50-autoscaler-sidecar/run

diff --git a/jigasi.yml b/jigasi.yml
index 210d5916cc..3ad1d3f658 100644
--- a/jigasi.yml
+++ b/jigasi.yml
@@ -11,6 +11,16 @@ services:
             - ${CONFIG}/jigasi:/config:Z
             - ${CONFIG}/transcripts:/tmp/transcripts:Z
         environment:
+            - AUTOSCALER_SIDECAR_KEY_FILE
+            - AUTOSCALER_SIDECAR_KEY_ID
+            - AUTOSCALER_SIDECAR_GROUP_NAME
+            - AUTOSCALER_SIDECAR_HOST_ID
+            - AUTOSCALER_SIDECAR_INSTANCE_ID
+            - AUTOSCALER_SIDECAR_PORT
+            - AUTOSCALER_SIDECAR_REGION
+            - AUTOSCALER_SIDECAR_SHUTDOWN_POLLING_INTERVAL
+            - AUTOSCALER_SIDECAR_STATS_POLLING_INTERVAL
+            - AUTOSCALER_URL
             - ENABLE_AUTH
             - ENABLE_GUESTS
             - XMPP_AUTH_DOMAIN
@@ -22,6 +32,7 @@ services:
             - XMPP_DOMAIN
             - PUBLIC_URL
             - JIGASI_DISABLE_SIP
+            - JIGASI_LOG_FILE
             - JIGASI_SIP_URI
             - JIGASI_SIP_PASSWORD
             - JIGASI_SIP_SERVER
diff --git a/jigasi/Dockerfile b/jigasi/Dockerfile
index 5aea861c9e..0a2ac1f396 100644
--- a/jigasi/Dockerfile
+++ b/jigasi/Dockerfile
@@ -11,7 +11,7 @@ LABEL org.opencontainers.image.documentation="https://jitsi.github.io/handbook/"
 ENV GOOGLE_APPLICATION_CREDENTIALS /config/key.json
 
 RUN apt-dpkg-wrap apt-get update && \
-    apt-dpkg-wrap apt-get install -y jigasi jq && \
+    apt-dpkg-wrap apt-get install -y jigasi jq jitsi-autoscaler-sidecar && \
     apt-cleanup
 
 COPY rootfs/ /
diff --git a/jigasi/rootfs/defaults/autoscaler-sidecar.config b/jigasi/rootfs/defaults/autoscaler-sidecar.config
new file mode 100644
index 0000000000..ca68cff2c9
--- /dev/null
+++ b/jigasi/rootfs/defaults/autoscaler-sidecar.config
@@ -0,0 +1,18 @@
+{{ $SHUTDOWN_POLLING_INTERVAL := .Env.AUTOSCALER_SIDECAR_SHUTDOWN_POLLING_INTERVAL | default "60" -}}
+{{ $STATS_POLLING_INTERVAL := .Env.AUTOSCALER_SIDECAR_STATS_POLLING_INTERVAL | default "30" -}}
+{{ $JIGASI_STATS_PORT := .Env.JIGASI_STATS_PORT | default "8788" -}}
+export SHUTDOWN_POLLING_INTERVAL={{ $SHUTDOWN_POLLING_INTERVAL }}
+export STATS_POLLING_INTERVAL={{ $STATS_POLLING_INTERVAL }}
+export PORT={{ .Env.AUTOSCALER_SIDECAR_PORT }}
+export GRACEFUL_SHUTDOWN_SCRIPT="/usr/share/jigasi/graceful_shutdown.sh"
+export TERMINATE_SCRIPT="/opt/jitsi/shutdown.sh"
+export ENABLE_REPORT_STATS=true
+export POLLING_URL="{{ .Env.AUTOSCALER_URL  }}/sidecar/poll"
+export STATUS_URL="{{ .Env.AUTOSCALER_URL }}/sidecar/status"
+export STATS_RETRIEVE_URL="http://localhost:{{ $JIGASI_STATS_PORT }}/about/stats"
+export STATS_REPORT_URL="{{ .Env.AUTOSCALER_URL }}/sidecar/stats"
+export ASAP_SIGNING_KEY_FILE="{{ .Env.AUTOSCALER_SIDECAR_KEY_FILE }}"
+export ASAP_JWT_KID="{{ .Env.AUTOSCALER_SIDECAR_KEY_ID }}"
+export INSTANCE_TYPE="jigasi"
+export INSTANCE_ID="{{ .Env.AUTOSCALER_SIDECAR_INSTANCE_ID }}"
+export INSTANCE_METADATA='{"environment":"{{ .Env.XMPP_ENV_NAME }}","region":"{{ .Env.AUTOSCALER_SIDECAR_REGION }}","group":"{{ .Env.AUTOSCALER_SIDECAR_GROUP_NAME }}","name":"{{ .Env.JIGASI_INSTANCE_ID }}","version":"{{ .Env.JIGASI_VERSION }}","privateIp":"{{ .Env.LOCAL_ADDRESS }}","hostId":"{{ .Env.AUTOSCALER_SIDECAR_HOST_ID }}"}'
diff --git a/jigasi/rootfs/etc/cont-init.d/10-config b/jigasi/rootfs/etc/cont-init.d/10-config
index fcadba6393..c158cb7940 100644
--- a/jigasi/rootfs/etc/cont-init.d/10-config
+++ b/jigasi/rootfs/etc/cont-init.d/10-config
@@ -13,6 +13,38 @@ if [[ "$JIGASI_XMPP_PASSWORD" == "$OLD_JIGASI_XMPP_PASSWORD" ]]; then
     exit 1
 fi
 
+# set random jigasi nickname for the instance if is not set
+[ -z "${JIGASI_INSTANCE_ID}" ] && export JIGASI_INSTANCE_ID="jigasi-$(date +%N)"
+
+# check for AUTOSCALER_URL, AUTOSCALER_SIDECAR_KEY_FILE and AUTOSCALER_SIDECAR_KEY_ID as indicator that sidecar should be enabled
+if [ -n "$AUTOSCALER_URL" ]; then
+    if [ -z "$AUTOSCALER_SIDECAR_KEY_FILE" ]; then
+        export AUTOSCALER_SIDECAR_KEY_FILE="/etc/jitsi/autoscaler-sidecar/asap.pem"
+    fi
+    if [ -z "$AUTOSCALER_SIDECAR_KEY_ID" ]; then
+        # assume key id is equal to the base real path of the key file minus .pem
+        export AUTOSCALER_SIDECAR_KEY_ID="$(basename "$(realpath "$AUTOSCALER_SIDECAR_KEY_FILE")" | tr -d '.pem')"
+    fi
+
+    if [ -f "$AUTOSCALER_SIDECAR_KEY_FILE" ]; then
+        echo "AUTOSCALER_URL found, enabling autoscaler sidecar"
+
+        export JIGASI_VERSION="$(dpkg -s jigasi | grep Version | awk '{print $2}' | sed 's/..$//')"
+
+        [ -z "$AUTOSCALER_SIDECAR_PORT" ] && export AUTOSCALER_SIDECAR_PORT="6000"
+        [ -z "$AUTOSCALER_SIDECAR_INSTANCE_ID" ] && export AUTOSCALER_SIDECAR_INSTANCE_ID="$JIGASI_INSTANCE_ID"
+        [ -z "$AUTOSCALER_SIDECAR_REGION" ] && export AUTOSCALER_SIDECAR_REGION="docker"
+        [ -z "$AUTOSCALER_SIDECAR_GROUP_NAME" ] && export AUTOSCALER_SIDECAR_GROUP_NAME="docker-jigasi"
+
+        mkdir -p /etc/jitsi/autoscaler-sidecar
+        tpl /defaults/autoscaler-sidecar.config > /etc/jitsi/autoscaler-sidecar/config
+    else
+        echo "No key file at $AUTOSCALER_SIDECAR_KEY_FILE, leaving autoscaler sidecar disabled"
+    fi
+else
+    echo "No AUTOSCALER_URL defined, leaving autoscaler sidecar disabled"
+fi
+
 tpl /defaults/logging.properties > /config/logging.properties
 tpl /defaults/sip-communicator.properties > /config/sip-communicator.properties
 
diff --git a/jigasi/rootfs/etc/services.d/50-autoscaler-sidecar/run b/jigasi/rootfs/etc/services.d/50-autoscaler-sidecar/run
new file mode 100644
index 0000000000..22f775088e
--- /dev/null
+++ b/jigasi/rootfs/etc/services.d/50-autoscaler-sidecar/run
@@ -0,0 +1,10 @@
+#!/usr/bin/with-contenv bash
+
+if [[ -n "$AUTOSCALER_URL" ]] && [[ -f "/etc/jitsi/autoscaler-sidecar/config" ]]; then
+    DAEMON="/usr/bin/node /usr/share/jitsi-autoscaler-sidecar/app.js"
+    exec s6-setuidgid autoscaler-sidecar /bin/bash -c ". /etc/jitsi/autoscaler-sidecar/config && exec $DAEMON"
+else
+    # if autoscaler-sidecar should not be started,
+    # prevent s6 from restarting this script again and again
+    s6-svc -O /var/run/s6/services/50-autoscaler-sidecar
+fi
diff --git a/jigasi/rootfs/etc/services.d/jigasi/run b/jigasi/rootfs/etc/services.d/jigasi/run
index 8b9eb5d512..9c7f054c6c 100644
--- a/jigasi/rootfs/etc/services.d/jigasi/run
+++ b/jigasi/rootfs/etc/services.d/jigasi/run
@@ -5,4 +5,7 @@ JAVA_SYS_PROPS="-Djava.util.logging.config.file=/config/logging.properties"
 DAEMON=/usr/share/jigasi/jigasi.sh
 DAEMON_OPTS="--nocomponent=true --configdir=/ --configdirname=config --min-port=${JIGASI_PORT_MIN:-20000} --max-port=${JIGASI_PORT_MAX:-20050}"
 
-exec s6-setuidgid jigasi /bin/bash -c "JAVA_SYS_PROPS=\"$JAVA_SYS_PROPS\" exec $DAEMON $DAEMON_OPTS"
+JIGASI_CMD="JAVA_SYS_PROPS=\"$JAVA_SYS_PROPS\" exec $DAEMON $DAEMON_OPTS"
+[ -n "$JIGASI_LOG_FILE" ] && JIGASI_CMD="$JIGASI_CMD 2>&1 | tee $JIGASI_LOG_FILE"
+
+exec s6-setuidgid jigasi /bin/bash -c "$JIGASI_CMD"

From 28d2b32cea0eca5f6614ac1c1c1d67626028a5ff Mon Sep 17 00:00:00 2001
From: damencho <damencho@jitsi.org>
Date: Wed, 20 Mar 2024 16:32:51 -0500
Subject: [PATCH 26/32] feat(prosody): Make sure muc tumbstones is disabled.

---
 prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua | 6 ++++++
 prosody/rootfs/defaults/conf.d/visitors.cfg.lua   | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua b/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua
index 8d0beeafd0..a979943f67 100644
--- a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua
+++ b/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua
@@ -311,6 +311,8 @@ Component "{{ $XMPP_INTERNAL_MUC_DOMAIN }}" "muc"
     muc_room_locking = false
     muc_room_default_public_jids = true
     muc_room_cache_size = 1000
+    muc_tombstones = false
+    muc_room_allow_persistent = false
 
 Component "{{ $XMPP_MUC_DOMAIN }}" "muc"
     restrict_room_creation = true
@@ -390,6 +392,8 @@ Component "{{ $XMPP_MUC_DOMAIN }}" "muc"
         "{{ $JIGASI_TRANSCRIBER_USER }}@{{ $XMPP_RECORDER_DOMAIN }}";
 {{- end }}
     }
+    muc_tombstones = false
+    muc_room_allow_persistent = false
 
 Component "focus.{{ $XMPP_DOMAIN }}" "client_proxy"
     target_address = "focus@{{ $XMPP_AUTH_DOMAIN }}"
@@ -419,6 +423,7 @@ Component "avmoderation.{{ $XMPP_DOMAIN }}" "av_moderation_component"
 Component "lobby.{{ $XMPP_DOMAIN }}" "muc"
     storage = "memory"
     restrict_room_creation = true
+    muc_tombstones = false
     muc_room_allow_persistent = false
     muc_room_cache_size = 10000
     muc_room_locking = false
@@ -441,6 +446,7 @@ Component "breakout.{{ $XMPP_DOMAIN }}" "muc"
     muc_room_cache_size = 10000
     muc_room_locking = false
     muc_room_default_public_jids = true
+    muc_tombstones = false
     muc_room_allow_persistent = false
     modules_enabled = {
         "muc_meeting_id";
diff --git a/prosody/rootfs/defaults/conf.d/visitors.cfg.lua b/prosody/rootfs/defaults/conf.d/visitors.cfg.lua
index 9534183fb5..a082b5bc02 100644
--- a/prosody/rootfs/defaults/conf.d/visitors.cfg.lua
+++ b/prosody/rootfs/defaults/conf.d/visitors.cfg.lua
@@ -170,6 +170,8 @@ Component '{{ $VISITORS_MUC_PREFIX }}.v{{ $VISITOR_INDEX }}.{{ $VISITORS_XMPP_DO
     muc_access_whitelist = {
         "{{ $XMPP_DOMAIN }}";
     }
+    muc_tombstones = false
+    muc_room_allow_persistent = false
 
     {{ if $ENABLE_RATE_LIMITS -}}
     -- Max allowed join/login rate in events per second.

From 2798426f408d2e11168c0bee9f2c59cc2b48c38e Mon Sep 17 00:00:00 2001
From: damencho <damencho@jitsi.org>
Date: Thu, 21 Mar 2024 06:40:51 -0500
Subject: [PATCH 27/32] feat(prosody): Adjusts lua to use generational GC.

---
 .../rootfs/defaults/conf.d/visitors.cfg.lua   | 23 +++++++++++++++++++
 prosody/rootfs/defaults/prosody.cfg.lua       |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/prosody/rootfs/defaults/conf.d/visitors.cfg.lua b/prosody/rootfs/defaults/conf.d/visitors.cfg.lua
index a082b5bc02..a9e0f5ecad 100644
--- a/prosody/rootfs/defaults/conf.d/visitors.cfg.lua
+++ b/prosody/rootfs/defaults/conf.d/visitors.cfg.lua
@@ -3,6 +3,12 @@
 {{ $ENABLE_RATE_LIMITS := .Env.PROSODY_ENABLE_RATE_LIMITS | default "0" | toBool -}}
 {{ $ENABLE_SUBDOMAINS := .Env.ENABLE_SUBDOMAINS | default "true" | toBool -}}
 {{ $ENABLE_XMPP_WEBSOCKET := .Env.ENABLE_XMPP_WEBSOCKET | default "1" | toBool -}}
+{{ $GC_TYPE := .Env.GC_TYPE | default "generational" -}}
+{{ $GC_INC_TH := .Env.GC_INC_TH | default 150 -}}
+{{ $GC_INC_SPEED := .Env.GC_INC_SPEED | default 250 -}}
+{{ $GC_INC_STEP_SIZE := .Env.GC_INC_STEP_SIZE | default 13 -}}
+{{ $GC_GEN_MIN_TH := .Env.GC_GEN_MIN_TH | default 20 -}}
+{{ $GC_GEN_MAX_TH := .Env.GC_GEN_MAX_TH | default 100 -}}
 {{ $JIBRI_RECORDER_USER := .Env.JIBRI_RECORDER_USER | default "recorder" -}}
 {{ $JIGASI_TRANSCRIBER_USER := .Env.JIGASI_TRANSCRIBER_USER | default "transcriber" -}}
 {{ $LIMIT_MESSAGES_CHECK_TOKEN := .Env.PROSODY_LIMIT_MESSAGES_CHECK_TOKEN | default "0" | toBool -}}
@@ -36,6 +42,23 @@
 {{ $XMPP_SERVER_S2S_PORT := .Env.XMPP_SERVER_S2S_PORT | default $S2S_PORT -}}
 {{ $XMPP_RECORDER_DOMAIN := .Env.XMPP_RECORDER_DOMAIN | default "recorder.meet.jitsi" -}}
 
+--Prosody garbage collector settings
+--For more information see https://prosody.im/doc/advanced_gc
+{{ if eq $GC_TYPE "generational" }}
+gc = {
+    mode = "generational";
+    minor_threshold = {{ $GC_GEN_MIN_TH }};
+    major_threshold = {{ $GC_GEN_MAX_TH }};
+}
+{{ else }}
+gc = {
+	mode = "incremental";
+	threshold = {{ $GC_INC_TH }};
+	speed = {{ $GC_INC_SPEED }};
+	step_size = {{ $GC_INC_STEP_SIZE }};
+}
+{{ end }}
+
 plugin_paths = { "/prosody-plugins/", "/prosody-plugins-custom" }
 
 muc_mapper_domain_base = "v{{ $VISITOR_INDEX }}.{{ $VISITORS_XMPP_DOMAIN }}";
diff --git a/prosody/rootfs/defaults/prosody.cfg.lua b/prosody/rootfs/defaults/prosody.cfg.lua
index 1f1b5d2643..ee67f34efa 100644
--- a/prosody/rootfs/defaults/prosody.cfg.lua
+++ b/prosody/rootfs/defaults/prosody.cfg.lua
@@ -4,7 +4,7 @@
 {{ $ENABLE_VISITORS := .Env.ENABLE_VISITORS | default "0" | toBool -}}
 {{ $ENABLE_S2S := or $ENABLE_VISITORS ( .Env.PROSODY_ENABLE_S2S | default "0" | toBool ) }}
 {{ $ENABLE_IPV6 := .Env.ENABLE_IPV6 | default "true" | toBool -}}
-{{ $GC_TYPE := .Env.GC_TYPE | default "incremental" -}}
+{{ $GC_TYPE := .Env.GC_TYPE | default "generational" -}}
 {{ $GC_INC_TH := .Env.GC_INC_TH | default 150 -}}
 {{ $GC_INC_SPEED := .Env.GC_INC_SPEED | default 250 -}}
 {{ $GC_INC_STEP_SIZE := .Env.GC_INC_STEP_SIZE | default 13 -}}

From 69bba176df1323d6cc39c4d106acdce48a0e42b7 Mon Sep 17 00:00:00 2001
From: damencho <damencho@jitsi.org>
Date: Thu, 21 Mar 2024 07:08:34 -0500
Subject: [PATCH 28/32] feat(prosody): Adjusts lua to use generational GC for
 brewery.cfg.lua.

---
 .../rootfs/defaults/conf.d/brewery.cfg.lua    | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/prosody/rootfs/defaults/conf.d/brewery.cfg.lua b/prosody/rootfs/defaults/conf.d/brewery.cfg.lua
index a139f98d6f..6e79ef5334 100644
--- a/prosody/rootfs/defaults/conf.d/brewery.cfg.lua
+++ b/prosody/rootfs/defaults/conf.d/brewery.cfg.lua
@@ -5,6 +5,30 @@
 {{ $JVB_XMPP_INTERNAL_MUC_DOMAIN := .Env.JVB_XMPP_INTERNAL_MUC_DOMAIN | default "muc.jvb.meet.jitsi" -}}
 {{ $JVB_AUTH_USER := .Env.JVB_AUTH_USER | default "jvb" -}}
 
+{{ $GC_TYPE := .Env.GC_TYPE | default "generational" -}}
+{{ $GC_INC_TH := .Env.GC_INC_TH | default 150 -}}
+{{ $GC_INC_SPEED := .Env.GC_INC_SPEED | default 250 -}}
+{{ $GC_INC_STEP_SIZE := .Env.GC_INC_STEP_SIZE | default 13 -}}
+{{ $GC_GEN_MIN_TH := .Env.GC_GEN_MIN_TH | default 20 -}}
+{{ $GC_GEN_MAX_TH := .Env.GC_GEN_MAX_TH | default 100 -}}
+
+--Prosody garbage collector settings
+--For more information see https://prosody.im/doc/advanced_gc
+{{ if eq $GC_TYPE "generational" }}
+gc = {
+    mode = "generational";
+    minor_threshold = {{ $GC_GEN_MIN_TH }};
+    major_threshold = {{ $GC_GEN_MAX_TH }};
+}
+{{ else }}
+gc = {
+	mode = "incremental";
+	threshold = {{ $GC_INC_TH }};
+	speed = {{ $GC_INC_SPEED }};
+	step_size = {{ $GC_INC_STEP_SIZE }};
+}
+{{ end }}
+
 admins = {
     "focus@{{ $JVB_XMPP_AUTH_DOMAIN }}",
     "{{ $JVB_AUTH_USER }}@{{ $JVB_XMPP_AUTH_DOMAIN }}"

From 80fc10ebf75870f8fc6c98624a2caa38ea582d1e Mon Sep 17 00:00:00 2001
From: damencho <damencho@jitsi.org>
Date: Thu, 21 Mar 2024 08:10:37 -0500
Subject: [PATCH 29/32] feat(prosody): Cleans up gc settings.

Reverts 69bba17 and some parts of 2798426.
---
 .../rootfs/defaults/conf.d/brewery.cfg.lua    | 24 -------------------
 .../rootfs/defaults/conf.d/visitors.cfg.lua   | 23 ------------------
 2 files changed, 47 deletions(-)

diff --git a/prosody/rootfs/defaults/conf.d/brewery.cfg.lua b/prosody/rootfs/defaults/conf.d/brewery.cfg.lua
index 6e79ef5334..a139f98d6f 100644
--- a/prosody/rootfs/defaults/conf.d/brewery.cfg.lua
+++ b/prosody/rootfs/defaults/conf.d/brewery.cfg.lua
@@ -5,30 +5,6 @@
 {{ $JVB_XMPP_INTERNAL_MUC_DOMAIN := .Env.JVB_XMPP_INTERNAL_MUC_DOMAIN | default "muc.jvb.meet.jitsi" -}}
 {{ $JVB_AUTH_USER := .Env.JVB_AUTH_USER | default "jvb" -}}
 
-{{ $GC_TYPE := .Env.GC_TYPE | default "generational" -}}
-{{ $GC_INC_TH := .Env.GC_INC_TH | default 150 -}}
-{{ $GC_INC_SPEED := .Env.GC_INC_SPEED | default 250 -}}
-{{ $GC_INC_STEP_SIZE := .Env.GC_INC_STEP_SIZE | default 13 -}}
-{{ $GC_GEN_MIN_TH := .Env.GC_GEN_MIN_TH | default 20 -}}
-{{ $GC_GEN_MAX_TH := .Env.GC_GEN_MAX_TH | default 100 -}}
-
---Prosody garbage collector settings
---For more information see https://prosody.im/doc/advanced_gc
-{{ if eq $GC_TYPE "generational" }}
-gc = {
-    mode = "generational";
-    minor_threshold = {{ $GC_GEN_MIN_TH }};
-    major_threshold = {{ $GC_GEN_MAX_TH }};
-}
-{{ else }}
-gc = {
-	mode = "incremental";
-	threshold = {{ $GC_INC_TH }};
-	speed = {{ $GC_INC_SPEED }};
-	step_size = {{ $GC_INC_STEP_SIZE }};
-}
-{{ end }}
-
 admins = {
     "focus@{{ $JVB_XMPP_AUTH_DOMAIN }}",
     "{{ $JVB_AUTH_USER }}@{{ $JVB_XMPP_AUTH_DOMAIN }}"
diff --git a/prosody/rootfs/defaults/conf.d/visitors.cfg.lua b/prosody/rootfs/defaults/conf.d/visitors.cfg.lua
index a9e0f5ecad..a082b5bc02 100644
--- a/prosody/rootfs/defaults/conf.d/visitors.cfg.lua
+++ b/prosody/rootfs/defaults/conf.d/visitors.cfg.lua
@@ -3,12 +3,6 @@
 {{ $ENABLE_RATE_LIMITS := .Env.PROSODY_ENABLE_RATE_LIMITS | default "0" | toBool -}}
 {{ $ENABLE_SUBDOMAINS := .Env.ENABLE_SUBDOMAINS | default "true" | toBool -}}
 {{ $ENABLE_XMPP_WEBSOCKET := .Env.ENABLE_XMPP_WEBSOCKET | default "1" | toBool -}}
-{{ $GC_TYPE := .Env.GC_TYPE | default "generational" -}}
-{{ $GC_INC_TH := .Env.GC_INC_TH | default 150 -}}
-{{ $GC_INC_SPEED := .Env.GC_INC_SPEED | default 250 -}}
-{{ $GC_INC_STEP_SIZE := .Env.GC_INC_STEP_SIZE | default 13 -}}
-{{ $GC_GEN_MIN_TH := .Env.GC_GEN_MIN_TH | default 20 -}}
-{{ $GC_GEN_MAX_TH := .Env.GC_GEN_MAX_TH | default 100 -}}
 {{ $JIBRI_RECORDER_USER := .Env.JIBRI_RECORDER_USER | default "recorder" -}}
 {{ $JIGASI_TRANSCRIBER_USER := .Env.JIGASI_TRANSCRIBER_USER | default "transcriber" -}}
 {{ $LIMIT_MESSAGES_CHECK_TOKEN := .Env.PROSODY_LIMIT_MESSAGES_CHECK_TOKEN | default "0" | toBool -}}
@@ -42,23 +36,6 @@
 {{ $XMPP_SERVER_S2S_PORT := .Env.XMPP_SERVER_S2S_PORT | default $S2S_PORT -}}
 {{ $XMPP_RECORDER_DOMAIN := .Env.XMPP_RECORDER_DOMAIN | default "recorder.meet.jitsi" -}}
 
---Prosody garbage collector settings
---For more information see https://prosody.im/doc/advanced_gc
-{{ if eq $GC_TYPE "generational" }}
-gc = {
-    mode = "generational";
-    minor_threshold = {{ $GC_GEN_MIN_TH }};
-    major_threshold = {{ $GC_GEN_MAX_TH }};
-}
-{{ else }}
-gc = {
-	mode = "incremental";
-	threshold = {{ $GC_INC_TH }};
-	speed = {{ $GC_INC_SPEED }};
-	step_size = {{ $GC_INC_STEP_SIZE }};
-}
-{{ end }}
-
 plugin_paths = { "/prosody-plugins/", "/prosody-plugins-custom" }
 
 muc_mapper_domain_base = "v{{ $VISITOR_INDEX }}.{{ $VISITORS_XMPP_DOMAIN }}";

From a5ebb99e3100b2e63cc4a4f16f98492fba9902f9 Mon Sep 17 00:00:00 2001
From: Aaron van Meerten <aaron.van.meerten@gmail.com>
Date: Thu, 21 Mar 2024 14:03:18 -0500
Subject: [PATCH 30/32] jibri: flag to support prometheus-style metrics (#1768)

* jibri: flag to support prometheus-style metrics
---
 jibri.yml                        | 1 +
 jibri/rootfs/defaults/jibri.conf | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/jibri.yml b/jibri.yml
index 057a45e0c2..fc68a07f0a 100644
--- a/jibri.yml
+++ b/jibri.yml
@@ -26,6 +26,7 @@ services:
             - IGNORE_CERTIFICATE_ERRORS
             - JIBRI_WEBHOOK_SUBSCRIBERS
             - JIBRI_INSTANCE_ID
+            - JIBRI_ENABLE_PROMETHEUS
             - JIBRI_HTTP_API_EXTERNAL_PORT
             - JIBRI_HTTP_API_INTERNAL_PORT
             - JIBRI_RECORDING_RESOLUTION
diff --git a/jibri/rootfs/defaults/jibri.conf b/jibri/rootfs/defaults/jibri.conf
index 993052f34b..33199cb6c1 100644
--- a/jibri/rootfs/defaults/jibri.conf
+++ b/jibri/rootfs/defaults/jibri.conf
@@ -1,3 +1,4 @@
+{{ $ENABLE_PROMETHEUS := .Env.JIBRI_ENABLE_PROMETHEUS | default "false" | toBool -}}
 {{ $JIBRI_RECORDING_RESOLUTION := .Env.JIBRI_RECORDING_RESOLUTION | default "1280x720" -}}
 {{ $JIBRI_RECORDING_VIDEO_ENCODE_PRESET := .Env.JIBRI_RECORDING_VIDEO_ENCODE_PRESET | default "veryfast" -}}
 {{ $JIBRI_RECORDING_CONSTANT_RATE_FACTOR := .Env.JIBRI_RECORDING_CONSTANT_RATE_FACTOR | default 25 -}}
@@ -76,13 +77,14 @@ jibri {
     }
     {{ end -}}
 
-    {{ if .Env.ENABLE_STATS_D -}}
     stats {
+    {{- if .Env.ENABLE_STATS_D }}
       enable-stats-d = {{ .Env.ENABLE_STATS_D }}
       host = "{{ $STATSD_HOST }}"
       port = {{ $STATSD_PORT }}
+    {{- end }}
+      prometheus.enabled = {{ $ENABLE_PROMETHEUS }}
     }
-    {{ end -}}
 }
 
 include "xmpp.conf"

From 066b844165bd6323509dc7ba3f034c1dc25f78cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <s@saghul.net>
Date: Fri, 22 Mar 2024 22:48:35 +0100
Subject: [PATCH 31/32] release: stable-9364-1

* a5ebb99 jibri: flag to support prometheus-style metrics (#1768)
* 80fc10e feat(prosody): Cleans up gc settings.
* 69bba17 feat(prosody): Adjusts lua to use generational GC for brewery.cfg.lua.
* 2798426 feat(prosody): Adjusts lua to use generational GC.
* 28d2b32 feat(prosody): Make sure muc tumbstones is disabled.
* d5df19d jigasi: autoscaler sidecar support (#1738)
* 0953ca0 jigasi: skip SIP configuration when configured as a transcriber
* ca1d670 fix: :bug: wrong quote in default config (#1761)
* 360361e jibri: move xmpp config for easier override (#1748)
* 452f5ba misc: working on unstable
---
 CHANGELOG.md       | 15 +++++++++++++++
 docker-compose.yml |  8 ++++----
 jibri.yml          |  2 +-
 jigasi.yml         |  2 +-
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 090be7556e..6926237034 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,18 @@
+## stable-9364-1
+
+Based on stable release 9364-1.
+
+* a5ebb99 jibri: flag to support prometheus-style metrics (#1768)
+* 80fc10e feat(prosody): Cleans up gc settings.
+* 69bba17 feat(prosody): Adjusts lua to use generational GC for brewery.cfg.lua.
+* 2798426 feat(prosody): Adjusts lua to use generational GC.
+* 28d2b32 feat(prosody): Make sure muc tumbstones is disabled.
+* d5df19d jigasi: autoscaler sidecar support (#1738)
+* 0953ca0 jigasi: skip SIP configuration when configured as a transcriber
+* ca1d670 fix: :bug: wrong quote in default config (#1761)
+* 360361e jibri: move xmpp config for easier override (#1748)
+* 452f5ba misc: working on unstable
+
 ## stable-9364
 
 Based on stable release 9364.
diff --git a/docker-compose.yml b/docker-compose.yml
index c4fce69e95..c1b049f551 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.5'
 services:
     # Frontend
     web:
-        image: jitsi/web:${JITSI_IMAGE_VERSION:-unstable}
+        image: jitsi/web:${JITSI_IMAGE_VERSION:-stable-9364-1}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '${HTTP_PORT}:80'
@@ -179,7 +179,7 @@ services:
 
     # XMPP server
     prosody:
-        image: jitsi/prosody:${JITSI_IMAGE_VERSION:-unstable}
+        image: jitsi/prosody:${JITSI_IMAGE_VERSION:-stable-9364-1}
         restart: ${RESTART_POLICY:-unless-stopped}
         expose:
             - '${XMPP_PORT:-5222}'
@@ -311,7 +311,7 @@ services:
 
     # Focus component
     jicofo:
-        image: jitsi/jicofo:${JITSI_IMAGE_VERSION:-unstable}
+        image: jitsi/jicofo:${JITSI_IMAGE_VERSION:-stable-9364-1}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '127.0.0.1:${JICOFO_REST_PORT:-8888}:8888'
@@ -393,7 +393,7 @@ services:
 
     # Video bridge
     jvb:
-        image: jitsi/jvb:${JITSI_IMAGE_VERSION:-unstable}
+        image: jitsi/jvb:${JITSI_IMAGE_VERSION:-stable-9364-1}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '${JVB_PORT:-10000}:${JVB_PORT:-10000}/udp'
diff --git a/jibri.yml b/jibri.yml
index fc68a07f0a..d4bddf00df 100644
--- a/jibri.yml
+++ b/jibri.yml
@@ -2,7 +2,7 @@ version: '3.5'
 
 services:
     jibri:
-        image: jitsi/jibri:${JITSI_IMAGE_VERSION:-unstable}
+        image: jitsi/jibri:${JITSI_IMAGE_VERSION:-stable-9364-1}
         restart: ${RESTART_POLICY:-unless-stopped}
         volumes:
             - ${CONFIG}/jibri:/config:Z
diff --git a/jigasi.yml b/jigasi.yml
index 3ad1d3f658..edfc780d4b 100644
--- a/jigasi.yml
+++ b/jigasi.yml
@@ -3,7 +3,7 @@ version: '3.5'
 services:
     # SIP gateway (audio)
     jigasi:
-        image: jitsi/jigasi:${JITSI_IMAGE_VERSION:-unstable}
+        image: jitsi/jigasi:${JITSI_IMAGE_VERSION:-stable-9364-1}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '${JIGASI_PORT_MIN:-20000}-${JIGASI_PORT_MAX:-20050}:${JIGASI_PORT_MIN:-20000}-${JIGASI_PORT_MAX:-20050}/udp'

From 55d8f23365d881c0ce7b59889ec2949f05bc9f29 Mon Sep 17 00:00:00 2001
From: Ben Banfield-Zanin <benbz@matrix.org>
Date: Wed, 27 Mar 2024 16:40:53 +0000
Subject: [PATCH 32/32] Update actions in our workflow

---
 .github/workflows/docker-publish-individual.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/docker-publish-individual.yml b/.github/workflows/docker-publish-individual.yml
index 0e400cbbd8..05a36fddb7 100644
--- a/.github/workflows/docker-publish-individual.yml
+++ b/.github/workflows/docker-publish-individual.yml
@@ -33,10 +33,10 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Checkout other repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: ${{ inputs.repository }}
         ref: ${{ inputs.ref }}
@@ -44,7 +44,7 @@ jobs:
       if: ${{ inputs.repository != '' }}
 
     - name: Log into registry ${{ env.REGISTRY }}
-      uses: docker/login-action@v2
+      uses: docker/login-action@v3
       with:
         registry: ${{ env.REGISTRY }}
         username: ${{ github.actor }}
@@ -52,7 +52,7 @@ jobs:
 
     - name: Extract Docker metadata
       id: meta
-      uses: docker/metadata-action@v4
+      uses: docker/metadata-action@v5
       with:
         images: ${{ env.REGISTRY_BASE_PATH }}/${{ inputs.folder }}
         # Turn off auto-latest, as we want to exclude openshift tags from that
@@ -60,7 +60,7 @@ jobs:
           latest=false
 
     - name: Build and push Docker image
-      uses: docker/build-push-action@v4
+      uses: docker/build-push-action@v5
       with:
         context: "${{ inputs.folder }}"
         push: ${{ github.event_name != 'pull_request' }}