From 17859ecccab07399db9e210e86010dbf57e6663c Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Wed, 17 Jan 2024 08:46:48 +0200 Subject: [PATCH] Put matrix-static-files in matrix_playbook_reverse_proxy_container_network unless matrix_playbook_reverse_proxy_type is "none" We likely weren't handling the `matrix_playbook_reverse_proxy_type: other-traefik-container` case well before. Now, we should be. --- group_vars/matrix_servers | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index f15c88e3b..a33aa35a5 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -4827,12 +4827,7 @@ matrix_user_verification_service_uvs_auth_token: "{{ '%s' | format(matrix_homese matrix_static_files_enabled: true -matrix_static_files_container_network: "{{ (matrix_playbook_reverse_proxy_container_network if matrix_playbook_reverse_proxy_type == 'playbook-managed-traefik' else matrix_static_files_identifier) }}" - -matrix_static_files_additional_networks_auto: |- - {{ - ([matrix_playbook_reverse_proxyable_services_additional_network] if (matrix_playbook_reverse_proxyable_services_additional_network and matrix_playbook_reverse_proxy_type != 'playbook-managed-traefik') else []) - }} +matrix_static_files_container_network: "{{ (matrix_static_files_identifier if matrix_playbook_reverse_proxy_type == 'none' else matrix_playbook_reverse_proxy_container_network) }}" matrix_static_files_container_labels_traefik_enabled: "{{ matrix_playbook_traefik_labels_enabled }}" matrix_static_files_container_labels_traefik_docker_network: "{{ matrix_playbook_reverse_proxyable_services_additional_network }}"