Skip to content

Commit 01adf09

Browse files
guillaumevillemontguillaumevillemont
committed
Merge tag 'tags/stable-10431' into openshift
2 parents 84e5dcc + 2b459c5 commit 01adf09

File tree

8 files changed

+14
-33
lines changed

8 files changed

+14
-33
lines changed

‎.github/workflows/unstable.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,12 @@ jobs:
2323
run: echo "date=$(date +%F)">> $GITHUB_OUTPUT
2424
- name: Prosody gpg key
2525
id: prosody_gpg_key
26-
run: curl --location --silent --show-error https://prosody.im/files/prosody-debian-packages.key | sudo dd of=/etc/apt/trusted.gpg.d/prosody.gpg
26+
run: curl --location --silent --show-error https://prosody.im/files/prosody-debian-packages.key | sudo dd of=/etc/apt/keyrings/prosody.gpg
27+
- name: Prosody dsa1024 key support
28+
run: echo 'APT::Key::Assert-Pubkey-Algo ">=rsa2048,ed25519,ed448,dsa1024";' | sudo tee /etc/apt/apt.conf.d/99weakkey-warning
2729
- name: Prosody repo
2830
id: prosody_repo
29-
run: echo "deb https://packages.prosody.im/debian bookworm main" | sudo tee /etc/apt/sources.list.d/prosody.list
31+
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
3032
- name: Jitsi repo
3133
uses: myci-actions/add-deb-repo@11
3234
with:

‎docker-compose.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
services:
22
# Frontend
33
web:
4-
image: jitsi/web:${JITSI_IMAGE_VERSION:-stable-10314}
4+
image: jitsi/web:${JITSI_IMAGE_VERSION:-stable-10431}
55
restart: ${RESTART_POLICY:-unless-stopped}
66
ports:
77
- '${HTTP_PORT}:80'
@@ -190,7 +190,7 @@ services:
190190

191191
# XMPP server
192192
prosody:
193-
image: jitsi/prosody:${JITSI_IMAGE_VERSION:-stable-10314}
193+
image: jitsi/prosody:${JITSI_IMAGE_VERSION:-stable-10431}
194194
restart: ${RESTART_POLICY:-unless-stopped}
195195
expose:
196196
- '${XMPP_PORT:-5222}'
@@ -340,7 +340,7 @@ services:
340340

341341
# Focus component
342342
jicofo:
343-
image: jitsi/jicofo:${JITSI_IMAGE_VERSION:-stable-10314}
343+
image: jitsi/jicofo:${JITSI_IMAGE_VERSION:-stable-10431}
344344
restart: ${RESTART_POLICY:-unless-stopped}
345345
ports:
346346
- '127.0.0.1:${JICOFO_REST_PORT:-8888}:8888'
@@ -437,7 +437,7 @@ services:
437437

438438
# Video bridge
439439
jvb:
440-
image: jitsi/jvb:${JITSI_IMAGE_VERSION:-stable-10314}
440+
image: jitsi/jvb:${JITSI_IMAGE_VERSION:-stable-10431}
441441
restart: ${RESTART_POLICY:-unless-stopped}
442442
ports:
443443
- '${JVB_PORT:-10000}:${JVB_PORT:-10000}/udp'

‎jibri.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: '3.5'
22

33
services:
44
jibri:
5-
image: jitsi/jibri:${JITSI_IMAGE_VERSION:-stable-10314}
5+
image: jitsi/jibri:${JITSI_IMAGE_VERSION:-stable-10431}
66
restart: ${RESTART_POLICY:-unless-stopped}
77
volumes:
88
- ${CONFIG}/jibri:/config:Z

‎jigasi.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: '3.5'
33
services:
44
# SIP gateway (audio)
55
jigasi:
6-
image: jitsi/jigasi:${JITSI_IMAGE_VERSION:-stable-10314}
6+
image: jitsi/jigasi:${JITSI_IMAGE_VERSION:-stable-10431}
77
restart: ${RESTART_POLICY:-unless-stopped}
88
ports:
99
- '${JIGASI_PORT_MIN:-20000}-${JIGASI_PORT_MAX:-20050}:${JIGASI_PORT_MIN:-20000}-${JIGASI_PORT_MAX:-20050}/udp'

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ org.jitsi.jigasi.xmpp.acc.SERVER_PORT={{ $XMPP_SERVER_ADDRESS._1 | default $XMPP
3434
org.jitsi.jigasi.xmpp.acc.VIDEO_CALLING_DISABLED=true
3535
org.jitsi.jigasi.xmpp.acc.JINGLE_NODES_ENABLED=false
3636
org.jitsi.jigasi.xmpp.acc.AUTO_DISCOVER_STUN=false
37+
org.jitsi.jigasi.xmpp.acc.USE_DEFAULT_STUN_SERVER=false
3738
org.jitsi.jigasi.xmpp.acc.IM_DISABLED=true
3839
org.jitsi.jigasi.xmpp.acc.SERVER_STORED_INFO_DISABLED=true
3940
org.jitsi.jigasi.xmpp.acc.IS_FILE_TRANSFER_DISABLED=true

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ net.java.sip.communicator.impl.protocol.jabber.acc-{{ $ID }}.IS_USE_UPNP=false
3939
net.java.sip.communicator.impl.protocol.jabber.acc-{{ $ID }}.IM_DISABLED=true
4040
net.java.sip.communicator.impl.protocol.jabber.acc-{{ $ID }}.SERVER_STORED_INFO_DISABLED=true
4141
net.java.sip.communicator.impl.protocol.jabber.acc-{{ $ID }}.IS_FILE_TRANSFER_DISABLED=true
42-
net.java.sip.communicator.impl.protocol.jabber.acc-{{ $ID }}.USE_DEFAULT_STUN_SERVER=true
42+
net.java.sip.communicator.impl.protocol.jabber.acc-{{ $ID }}.USE_DEFAULT_STUN_SERVER=false
4343
net.java.sip.communicator.impl.protocol.jabber.acc-{{ $ID }}.ENCRYPTION_PROTOCOL.DTLS-SRTP=0
4444
net.java.sip.communicator.impl.protocol.jabber.acc-{{ $ID }}.ENCRYPTION_PROTOCOL_STATUS.DTLS-SRTP=true
4545
net.java.sip.communicator.impl.protocol.jabber.acc-{{ $ID }}.VIDEO_CALLING_DISABLED=true

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

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -174,25 +174,18 @@ VirtualHost "{{ $XMPP_DOMAIN }}"
174174
}
175175
modules_enabled = {
176176
"bosh";
177+
"features_identity";
177178
{{ if $ENABLE_XMPP_WEBSOCKET }}
178179
"websocket";
179180
"smacks"; -- XEP-0198: Stream Management
180181
{{ end }}
181-
"speakerstats";
182182
"conference_duration";
183-
"room_metadata";
184-
{{ if $ENABLE_END_CONFERENCE }}
185-
"end_conference";
186-
{{ end }}
187183
{{ if $ENABLE_LOBBY }}
188184
"muc_lobby_rooms";
189185
{{ end }}
190186
{{ if $ENABLE_BREAKOUT_ROOMS }}
191187
"muc_breakout_rooms";
192188
{{ end }}
193-
{{ if $ENABLE_AV_MODERATION }}
194-
"av_moderation";
195-
{{ end }}
196189
{{ if .Env.XMPP_MODULES }}
197190
"{{ join "\";\n \"" (splitList "," .Env.XMPP_MODULES | compact) }}";
198191
{{ end }}
@@ -212,7 +205,6 @@ VirtualHost "{{ $XMPP_DOMAIN }}"
212205
}
213206

214207
main_muc = "{{ $XMPP_MUC_DOMAIN }}"
215-
room_metadata_component = "metadata.{{ $XMPP_DOMAIN }}"
216208
{{ if $ENABLE_LOBBY }}
217209
lobby_muc = "lobby.{{ $XMPP_DOMAIN }}"
218210
{{ if or $ENABLE_RECORDING $ENABLE_TRANSCRIPTIONS }}
@@ -228,17 +220,6 @@ VirtualHost "{{ $XMPP_DOMAIN }}"
228220
breakout_rooms_muc = "breakout.{{ $XMPP_DOMAIN }}"
229221
{{ end }}
230222

231-
speakerstats_component = "speakerstats.{{ $XMPP_DOMAIN }}"
232-
conference_duration_component = "conferenceduration.{{ $XMPP_DOMAIN }}"
233-
234-
{{ if $ENABLE_END_CONFERENCE }}
235-
end_conference_component = "endconference.{{ $XMPP_DOMAIN }}"
236-
{{ end }}
237-
238-
{{ if $ENABLE_AV_MODERATION }}
239-
av_moderation_component = "avmoderation.{{ $XMPP_DOMAIN }}"
240-
{{ end }}
241-
242223
c2s_require_encryption = {{ $C2S_REQUIRE_ENCRYPTION }}
243224

244225
{{ if $ENABLE_VISITORS -}}
@@ -416,9 +397,6 @@ Component "speakerstats.{{ $XMPP_DOMAIN }}" "speakerstats_component"
416397
}
417398
{{- end }}
418399

419-
Component "conferenceduration.{{ $XMPP_DOMAIN }}" "conference_duration_component"
420-
muc_component = "{{ $XMPP_MUC_DOMAIN }}"
421-
422400
{{ if $ENABLE_END_CONFERENCE }}
423401
Component "endconference.{{ $XMPP_DOMAIN }}" "end_conference"
424402
muc_component = "{{ $XMPP_MUC_DOMAIN }}"

‎transcriber.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: '3.5'
22

33
services:
44
transcriber:
5-
image: jitsi/jigasi:${JITSI_IMAGE_VERSION:-stable-10314}
5+
image: jitsi/jigasi:${JITSI_IMAGE_VERSION:-stable-10431}
66
restart: ${RESTART_POLICY:-unless-stopped}
77
volumes:
88
- ${CONFIG}/transcriber:/config:Z

0 commit comments

Comments
 (0)