mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2026-07-14 18:52:50 +03:00
Fix double-slash in Jitsi's Etherpad integration URLs
etherpad_base_url always ends with a trailing slash, and the playbook passed it verbatim to jitsi_etherpad_base, which the Jitsi role appends path segments to (e.g. /p/). The generated Jitsi configuration therefore contained URLs like https://etherpad.example.com//p/, which can 404 depending on the web server. Strip trailing slashes when wiring. Fixes #3471 Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
@@ -3837,7 +3837,9 @@ jitsi_turns_port: "{{ coturn_container_stun_tls_host_bind_port_tcp.split(':')[-1
|
|||||||
# Falls back to the scalar.vector.im etherpad in case someone sets `jitsi_etherpad_enabled` to true,
|
# Falls back to the scalar.vector.im etherpad in case someone sets `jitsi_etherpad_enabled` to true,
|
||||||
# while also setting `etherpad_enabled` to false.
|
# while also setting `etherpad_enabled` to false.
|
||||||
jitsi_etherpad_enabled: "{{ etherpad_enabled }}"
|
jitsi_etherpad_enabled: "{{ etherpad_enabled }}"
|
||||||
jitsi_etherpad_base: "{{ etherpad_base_url if etherpad_enabled else 'https://scalar.vector.im/etherpad' }}"
|
# The trailing slash is stripped, because the Jitsi role appends path segments (e.g. `/p/`) itself
|
||||||
|
# and `etherpad_base_url` ends with a slash, which would otherwise produce double-slash URLs.
|
||||||
|
jitsi_etherpad_base: "{{ (etherpad_base_url | regex_replace('/+$', '')) if etherpad_enabled else 'https://scalar.vector.im/etherpad' }}"
|
||||||
|
|
||||||
# Allow verification using JWT and matrix-UVS
|
# Allow verification using JWT and matrix-UVS
|
||||||
jitsi_prosody_auth_matrix_uvs_sync_power_levels: "{{ matrix_user_verification_service_enabled }}"
|
jitsi_prosody_auth_matrix_uvs_sync_power_levels: "{{ matrix_user_verification_service_enabled }}"
|
||||||
|
|||||||
Reference in New Issue
Block a user