Merge tag 'tags/stable-10431'

Author: guillaumevillemont

.github/workflows/unstable.yml

@@ -23,10 +23,12 @@ jobs:
         run: echo "date=$(date +%F)">> $GITHUB_OUTPUT
       - name: Prosody gpg key
         id: prosody_gpg_key
-        run: curl --location --silent --show-error https://prosody.im/files/prosody-debian-packages.key | sudo dd of=/etc/apt/trusted.gpg.d/prosody.gpg
+        run: curl --location --silent --show-error https://prosody.im/files/prosody-debian-packages.key | sudo dd of=/etc/apt/keyrings/prosody.gpg
+      - name: Prosody dsa1024 key support
+        run: echo 'APT::Key::Assert-Pubkey-Algo ">=rsa2048,ed25519,ed448,dsa1024";' | sudo tee /etc/apt/apt.conf.d/99weakkey-warning
       - name: Prosody repo
         id: prosody_repo
-        run: echo "deb https://packages.prosody.im/debian bookworm main" | sudo tee /etc/apt/sources.list.d/prosody.list
+        run: echo "deb [signed-by=/etc/apt/keyrings/prosody.gpg] https://packages.prosody.im/debian bookworm main" | sudo tee /etc/apt/sources.list.d/prosody.list
       - name: Jitsi repo
         uses: myci-actions/add-deb-repo@11
         with:

docker-compose.yml

@@ -1,7 +1,7 @@
 services:
     # Frontend
     web:
-        image: jitsi/web:${JITSI_IMAGE_VERSION:-stable-10314}
+        image: jitsi/web:${JITSI_IMAGE_VERSION:-stable-10431}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '${HTTP_PORT}:80'
@@ -190,7 +190,7 @@ services:
 
     # XMPP server
     prosody:
-        image: jitsi/prosody:${JITSI_IMAGE_VERSION:-stable-10314}
+        image: jitsi/prosody:${JITSI_IMAGE_VERSION:-stable-10431}
         restart: ${RESTART_POLICY:-unless-stopped}
         expose:
             - '${XMPP_PORT:-5222}'
@@ -340,7 +340,7 @@ services:
 
     # Focus component
     jicofo:
-        image: jitsi/jicofo:${JITSI_IMAGE_VERSION:-stable-10314}
+        image: jitsi/jicofo:${JITSI_IMAGE_VERSION:-stable-10431}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '127.0.0.1:${JICOFO_REST_PORT:-8888}:8888'
@@ -437,7 +437,7 @@ services:
 
     # Video bridge
     jvb:
-        image: jitsi/jvb:${JITSI_IMAGE_VERSION:-stable-10314}
+        image: jitsi/jvb:${JITSI_IMAGE_VERSION:-stable-10431}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '${JVB_PORT:-10000}:${JVB_PORT:-10000}/udp'

jibri.yml

@@ -2,7 +2,7 @@ version: '3.5'
 
 services:
     jibri:
-        image: jitsi/jibri:${JITSI_IMAGE_VERSION:-stable-10314}
+        image: jitsi/jibri:${JITSI_IMAGE_VERSION:-stable-10431}
         restart: ${RESTART_POLICY:-unless-stopped}
         volumes:
             - ${CONFIG}/jibri:/config:Z

jigasi.yml

@@ -3,7 +3,7 @@ version: '3.5'
 services:
     # SIP gateway (audio)
     jigasi:
-        image: jitsi/jigasi:${JITSI_IMAGE_VERSION:-stable-10314}
+        image: jitsi/jigasi:${JITSI_IMAGE_VERSION:-stable-10431}
         restart: ${RESTART_POLICY:-unless-stopped}
         ports:
             - '${JIGASI_PORT_MIN:-20000}-${JIGASI_PORT_MAX:-20050}:${JIGASI_PORT_MIN:-20000}-${JIGASI_PORT_MAX:-20050}/udp'

jigasi/rootfs/defaults/sip-communicator.properties

@@ -34,6 +34,7 @@ org.jitsi.jigasi.xmpp.acc.SERVER_PORT={{ $XMPP_SERVER_ADDRESS._1 | default $XMPP
 org.jitsi.jigasi.xmpp.acc.VIDEO_CALLING_DISABLED=true
 org.jitsi.jigasi.xmpp.acc.JINGLE_NODES_ENABLED=false
 org.jitsi.jigasi.xmpp.acc.AUTO_DISCOVER_STUN=false
+org.jitsi.jigasi.xmpp.acc.USE_DEFAULT_STUN_SERVER=false
 org.jitsi.jigasi.xmpp.acc.IM_DISABLED=true
 org.jitsi.jigasi.xmpp.acc.SERVER_STORED_INFO_DISABLED=true
 org.jitsi.jigasi.xmpp.acc.IS_FILE_TRANSFER_DISABLED=true

jigasi/rootfs/defaults/xmpp-sip-communicator.properties

@@ -39,7 +39,7 @@ net.java.sip.communicator.impl.protocol.jabber.acc-{{ $ID }}.IS_USE_UPNP=false
 net.java.sip.communicator.impl.protocol.jabber.acc-{{ $ID }}.IM_DISABLED=true
 net.java.sip.communicator.impl.protocol.jabber.acc-{{ $ID }}.SERVER_STORED_INFO_DISABLED=true
 net.java.sip.communicator.impl.protocol.jabber.acc-{{ $ID }}.IS_FILE_TRANSFER_DISABLED=true
-net.java.sip.communicator.impl.protocol.jabber.acc-{{ $ID }}.USE_DEFAULT_STUN_SERVER=true
+net.java.sip.communicator.impl.protocol.jabber.acc-{{ $ID }}.USE_DEFAULT_STUN_SERVER=false
 net.java.sip.communicator.impl.protocol.jabber.acc-{{ $ID }}.ENCRYPTION_PROTOCOL.DTLS-SRTP=0
 net.java.sip.communicator.impl.protocol.jabber.acc-{{ $ID }}.ENCRYPTION_PROTOCOL_STATUS.DTLS-SRTP=true
 net.java.sip.communicator.impl.protocol.jabber.acc-{{ $ID }}.VIDEO_CALLING_DISABLED=true

prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua

@@ -174,25 +174,18 @@ VirtualHost "{{ $XMPP_DOMAIN }}"
     }
     modules_enabled = {
         "bosh";
+        "features_identity";
         {{ if $ENABLE_XMPP_WEBSOCKET }}
         "websocket";
         "smacks"; -- XEP-0198: Stream Management
         {{ end }}
-        "speakerstats";
         "conference_duration";
-        "room_metadata";
-        {{ if $ENABLE_END_CONFERENCE }}
-        "end_conference";
-        {{ end }}
         {{ if $ENABLE_LOBBY }}
         "muc_lobby_rooms";
         {{ end }}
         {{ if $ENABLE_BREAKOUT_ROOMS }}
         "muc_breakout_rooms";
         {{ end }}
-        {{ if $ENABLE_AV_MODERATION }}
-        "av_moderation";
-        {{ end }}
         {{ if .Env.XMPP_MODULES }}
         "{{ join "\";\n        \"" (splitList "," .Env.XMPP_MODULES | compact) }}";
         {{ end }}
@@ -212,7 +205,6 @@ VirtualHost "{{ $XMPP_DOMAIN }}"
     }
 
     main_muc = "{{ $XMPP_MUC_DOMAIN }}"
-    room_metadata_component = "metadata.{{ $XMPP_DOMAIN }}"
     {{ if $ENABLE_LOBBY }}
     lobby_muc = "lobby.{{ $XMPP_DOMAIN }}"
     {{ if or $ENABLE_RECORDING $ENABLE_TRANSCRIPTIONS }}
@@ -228,17 +220,6 @@ VirtualHost "{{ $XMPP_DOMAIN }}"
     breakout_rooms_muc = "breakout.{{ $XMPP_DOMAIN }}"
     {{ end }}
 
-    speakerstats_component = "speakerstats.{{ $XMPP_DOMAIN }}"
-    conference_duration_component = "conferenceduration.{{ $XMPP_DOMAIN }}"
-
-    {{ if $ENABLE_END_CONFERENCE }}
-    end_conference_component = "endconference.{{ $XMPP_DOMAIN }}"
-    {{ end }}
-
-    {{ if $ENABLE_AV_MODERATION }}
-    av_moderation_component = "avmoderation.{{ $XMPP_DOMAIN }}"
-    {{ end }}
-
     c2s_require_encryption = {{ $C2S_REQUIRE_ENCRYPTION }}
 
     {{ if $ENABLE_VISITORS -}}
@@ -416,9 +397,6 @@ Component "speakerstats.{{ $XMPP_DOMAIN }}" "speakerstats_component"
     }
     {{- end }}
 
-Component "conferenceduration.{{ $XMPP_DOMAIN }}" "conference_duration_component"
-    muc_component = "{{ $XMPP_MUC_DOMAIN }}"
-
 {{ if $ENABLE_END_CONFERENCE }}
 Component "endconference.{{ $XMPP_DOMAIN }}" "end_conference"
     muc_component = "{{ $XMPP_MUC_DOMAIN }}"

transcriber.yml

@@ -2,7 +2,7 @@ version: '3.5'
 
 services:
     transcriber:
-        image: jitsi/jigasi:${JITSI_IMAGE_VERSION:-stable-10314}
+        image: jitsi/jigasi:${JITSI_IMAGE_VERSION:-stable-10431}
         restart: ${RESTART_POLICY:-unless-stopped}
         volumes:
             - ${CONFIG}/transcriber:/config:Z