From a9eba7ab329f3c61e19df08a5d37217f60d4c97f Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Fri, 26 Jan 2024 13:07:09 +0200 Subject: [PATCH] Fix turn: fallback URIs missing due to Jinja operator priorities --- group_vars/matrix_servers | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index d5034917c..d32f73cf1 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -3960,17 +3960,15 @@ matrix_synapse_email_notif_from: "Matrix <{{ exim_relay_sender_address }}>" matrix_synapse_turn_uris: | {{ - [] - + - [ + ([ 'turns:' + matrix_server_fqn_matrix + '?transport=udp', 'turns:' + matrix_server_fqn_matrix + '?transport=tcp', - ] if matrix_coturn_enabled and matrix_coturn_tls_enabled else [] + ] if matrix_coturn_enabled and matrix_coturn_tls_enabled else []) + - [ + ([ 'turn:' + matrix_server_fqn_matrix + '?transport=udp', 'turn:' + matrix_server_fqn_matrix + '?transport=tcp', - ] if matrix_coturn_enabled else [] + ] if matrix_coturn_enabled else []) }} matrix_synapse_turn_shared_secret: "{{ matrix_coturn_turn_static_auth_secret if matrix_coturn_enabled else '' }}" @@ -4705,17 +4703,15 @@ matrix_conduit_container_labels_internal_client_api_traefik_entrypoints: "{{ mat matrix_conduit_turn_uris: | {{ - [] - + - [ + ([ 'turns:' + matrix_server_fqn_matrix + '?transport=udp', 'turns:' + matrix_server_fqn_matrix + '?transport=tcp', - ] if matrix_coturn_enabled and matrix_coturn_tls_enabled else [] + ] if matrix_coturn_enabled and matrix_coturn_tls_enabled else []) + - [ + ([ 'turn:' + matrix_server_fqn_matrix + '?transport=udp', 'turn:' + matrix_server_fqn_matrix + '?transport=tcp', - ] if matrix_coturn_enabled else [] + ] if matrix_coturn_enabled else []) }} matrix_conduit_turn_secret: "{{ matrix_coturn_turn_static_auth_secret if matrix_coturn_enabled else '' }}"