Update to 2024-07-22 10:00

roles/jitsi/templates/jicofo/jicofo.conf.j2

@@ -2,8 +2,17 @@
 jicofo {
 
   authentication {
-    enabled = {{ (jitsi_auth == 'sso' or jitsi_auth == 'ldap') | ternary('true', 'false') }}
-    type = {{ (jitsi_auth == 'ldap') | ternary('XMPP', 'SHIBBOLETH') }}
+{% if jitsi_auth == 'sso' %}
+    enabled = true
+    type = SHIBBOLETH
+{% elif jitsi_auth == 'ldap' %}
+    enabled = true
+    type = XMPP
+{% elif jitsi_auth == 'token' %}
+    enabled = true
+    type = JWT
+    login-url = {{ jitsi_domain }}
+{% endif %}
   }
 
   bridge {
@@ -28,5 +37,6 @@ jicofo {
       password = "{{ jitsi_jicofo_xmpp_pass }}"
       client-proxy = focus.{{ jitsi_domain }}
     }
+    trusted-domains = ["{{ jitsi_jibri_xmpp_domain | default('recorder.' ~ jitsi_jibri_domain) }}"]
   }
 }

roles/jitsi/templates/prosody.cfg.lua.j2

@@ -11,7 +11,10 @@ external_services = {
 {% for stun in jitsi_stun_servers %}
   {
     type = "{{ stun | urlsplit('scheme') }}",
-    host = "{{ stun | regex_replace('(turns?|stun):([^:]+)(:\d+)?.*', '\\2') }}{% if stun | regex_replace('(turns?|stun):.+:(\d+)?.*', '\\2') | int > 0 and stun | regex_replace('(turns?|stun):.+:(\d+)?.*', '\\2') | int < 65535 %}:{{ stun | regex_replace('(turns?|stun):.+:(\d+)?.*', '\\2') }}{% endif %}",
+    host = "{{ stun | regex_replace('(turns?|stun):([^:]+)(:\d+)?.*', '\\2') }}",
+{% if stun | regex_replace('(turns?|stun):.+:(\d+)?.*', '\\2') | int > 0 and stun | regex_replace('(turns?|stun):.+:(\d+)?.*', '\\2') | int < 65535 %}
+    port = {{ stun | regex_replace('(turns?|stun):.+:(\d+)?.*', '\\2') }},
+{% endif %}
 {% if stun | urlsplit('query') is search('transport=') %}
     transport = "{{ stun | urlsplit('query') | regex_replace('.*transport=(udp|tcp).*', '\\1') }}",
 {% endif %}
@@ -24,13 +27,13 @@ external_services = {
 {% endfor %}
 };
 
-cross_domain_bosh = false;
+-- cross_domain_bosh = false;
 cross_domain_websocket = true;
 consider_bosh_secure = true;
 
 unlimited_jids = {
-    "{{ jitsi_jicofo_xmpp_user }}@{{ jitsi_auth_domain }}",
-    "{{ jitsi_videobridge_xmpp_user }}@{{ jitsi_videobridge_xmpp_domain }}"
+  "{{ jitsi_jicofo_xmpp_user }}@{{ jitsi_auth_domain }}",
+  "{{ jitsi_videobridge_xmpp_user }}@{{ jitsi_videobridge_xmpp_domain }}"
 }
 
 VirtualHost "{{ jitsi_domain }}"
@@ -45,40 +48,59 @@ VirtualHost "{{ jitsi_domain }}"
   ldap_filter = "{{ jitsi_ldap_filter }}"
   ldap_scope = "subtree"
   ldap_tls = {{ jitsi_ldap_starttls | ternary('true','false') }}
+{% elif jitsi_auth == 'token' %}
+  authentication = "token"
+  app_id = "{{ jitsi_token_app_id }}";
+  asap_accepted_issuers = "{{ jitsi_token_iss }}";
+  asap_accepted_audiences = "{{ jitsi_token_aud }}";
+{% if jitsi_token_app_secret is defined %}
+  app_secret = "{{ jitsi_token_app_secret }}";
+{% elif jitsi_token_asap_key_server is defined %}
+  asap_key_server = "{{ jitsi_token_asap_key_server }}";
+{% endif %}
+  allow_empty_token = false;
 {% else %}
-  authentication = "anonymous"
+  authentication = "jitsi-anonymous"
 {% endif %}
   ssl = {
     key = "{{ jitsi_key_path }}";
     certificate = "{{ jitsi_cert_path }}";
   }
 
+  c2s_require_encryption = false
+  allow_unencrypted_plain_auth = true
+  av_moderation_component = "avmoderation.{{ jitsi_domain }}"
+  speakerstats_component = "speakerstats.{{ jitsi_domain }}"
+  end_conference_component = "endconference.{{ jitsi_domain }}"
+
   modules_enabled = {
     "bosh";
     "pubsub";
-    "ping";
     "websocket";
-    "external_services";
+    "ping";
     "speakerstats";
+    "external_services";
     "conference_duration";
+    "end_conference";
     "muc_lobby_rooms";
-    "participant_metadata";
     "muc_breakout_rooms";
     "av_moderation";
+    "room_metadata";
+    "participant_metadata";
+    "presence_identity";
   }
-  c2s_require_encryption = false
-  allow_unencrypted_plain_auth = true
-  speakerstats_component = "speakerstats.{{ jitsi_domain }}"
+
   conference_duration_component = "conferenceduration.{{ jitsi_domain }}"
   lobby_muc = "lobby.{{ jitsi_domain }}"
   breakout_rooms_muc = "breakout.{{ jitsi_domain }}"
+  room_metadata_component = "metadata.{{ jitsi_domain }}"
   main_muc = "conference.{{ jitsi_domain }}"
   muc_lobby_whitelist = { "recorder.{{ jitsi_domain }}" }
 
-{% if jitsi_auth == 'ldap' %}
+{% if jitsi_auth == 'ldap' or jitsi_auth == 'token' %}
 -- Guest virtual domain
 VirtualHost "guest.{{ jitsi_domain }}"
-  authentication = "anonymous"
+  authentication = "jitsi-anonymous"
   c2s_require_encryption = false
   modules_enabled = {
     "participant_metadata";
@@ -101,10 +123,12 @@ VirtualHost "recorder.{{ jitsi_domain }}"
   c2s_require_encryption = false
 
 Component "conference.{{ jitsi_domain }}" "muc"
+  restrict_room_creation = true
   storage = "memory"
   modules_enabled = {
     "ping";
     "jibri_bypass_pwd";
+    "muc_hide_all";
     "muc_meeting_id";
     "muc_domain_mapper";
     "polls";
@@ -113,11 +137,19 @@ Component "conference.{{ jitsi_domain }}" "muc"
   admins = { "{{ jitsi_jicofo_xmpp_user }}@{{ jitsi_auth_domain }}" }
   muc_room_locking = false
   muc_room_default_public_jids = true
+  muc_password_whitelist = {
+    "{{ jitsi_jicofo_xmpp_user }}@{{ jitsi_auth_domain }}"
+  }
 
 Component "internal.{{ jitsi_auth_domain }}" "muc"
   storage = "memory"
-  modules_enabled = { "ping"; }
-  muc_room_cache_size = 1000
+  modules_enabled = {
+    "muc_hide_all";
+    "ping";
+  }
+  admins = { "{{ jitsi_jicofo_xmpp_user }}@{{ jitsi_auth_domain }}" }
+  muc_room_locking = false
+  muc_room_default_public_jids = true
 
 Component "focus.{{ jitsi_domain }}" "client_proxy"
   target_address = "{{ jitsi_jicofo_xmpp_user }}@{{ jitsi_auth_domain }}"
@@ -128,6 +160,9 @@ Component "speakerstats.{{ jitsi_domain }}" "speakerstats_component"
 Component "conferenceduration.{{ jitsi_domain }}" "conference_duration_component"
   muc_component = "conference.{{ jitsi_domain }}"
 
+Component "endconference.{{ jitsi_domain }}" "end_conference"
+  muc_component = "conference.{{ jitsi_domain }}"
+
 Component "avmoderation.{{ jitsi_domain }}" "av_moderation_component"
   muc_component = "conference.{{ jitsi_domain }}"
 
@@ -137,16 +172,24 @@ Component "lobby.{{ jitsi_domain }}" "muc"
   muc_room_locking = false
   muc_room_default_public_jids = true
   modules_enabled = {
+    "muc_hide_all";
     "muc_rate_limit";
+    "polls";
   }
 
+Component "metadata.{{ jitsi_domain }}" "room_metadata_component"
+  muc_component = "conference.{{ jitsi_domain }}"
+  breakout_rooms_component = "breakout.{{ jitsi_domain }}"
+
 Component "breakout.{{ jitsi_domain }}" "muc"
   restrict_room_creation = true
   storage = "memory"
   modules_enabled = {
+    "muc_hide_all";
     "muc_meeting_id";
     "muc_domain_mapper";
     "muc_rate_limit";
+    "polls";
   }
   admins = { "{{ jitsi_jicofo_xmpp_user }}@{{ jitsi_auth_domain }}" }
   muc_room_locking = false