From 0ea3fa0e859d57f0b49561aeeaecec479e786a57 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Thu, 4 Jan 2024 10:53:43 +0200 Subject: [PATCH] Add matrix_synapse_reverse_proxy_companion_container_labels_traefik_hostname to simplify wiring --- group_vars/matrix_servers | 5 +---- .../defaults/main.yml | 7 ++++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index 67cdc6419..4448e074e 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -3964,14 +3964,11 @@ matrix_synapse_reverse_proxy_companion_container_labels_traefik_enabled: "{{ mat matrix_synapse_reverse_proxy_companion_container_labels_traefik_docker_network: "{{ matrix_playbook_reverse_proxyable_services_additional_network }}" matrix_synapse_reverse_proxy_companion_container_labels_traefik_entrypoints: "{{ devture_traefik_entrypoint_primary }}" matrix_synapse_reverse_proxy_companion_container_labels_traefik_tls_certResolver: "{{ devture_traefik_certResolver_primary }}" +matrix_synapse_reverse_proxy_companion_container_labels_traefik_hostname: "{{ matrix_server_fqn_matrix }}" -matrix_synapse_reverse_proxy_companion_container_labels_client_root_traefik_hostname: "{{ matrix_server_fqn_matrix }}" matrix_synapse_reverse_proxy_companion_container_labels_client_root_redirection_enabled: "{{ matrix_synapse_reverse_proxy_companion_container_labels_client_root_redirection_url != '' }}" matrix_synapse_reverse_proxy_companion_container_labels_client_root_redirection_url: "{{ (('https://' if matrix_playbook_ssl_enabled else 'http://') + matrix_server_fqn_element) if matrix_client_element_enabled else '' }}" -matrix_synapse_reverse_proxy_companion_container_labels_client_api_traefik_hostname: "{{ matrix_server_fqn_matrix }}" - -matrix_synapse_reverse_proxy_companion_container_labels_federation_api_traefik_hostname: "{{ matrix_server_fqn_matrix }}" matrix_synapse_reverse_proxy_companion_container_labels_federation_api_traefik_entrypoints: "{{ matrix_federation_traefik_entrypoint }}" matrix_synapse_reverse_proxy_companion_synapse_workers_enabled: "{{ matrix_synapse_workers_enabled }}" diff --git a/roles/custom/matrix-synapse-reverse-proxy-companion/defaults/main.yml b/roles/custom/matrix-synapse-reverse-proxy-companion/defaults/main.yml index 441d70c77..b1f2d4278 100644 --- a/roles/custom/matrix-synapse-reverse-proxy-companion/defaults/main.yml +++ b/roles/custom/matrix-synapse-reverse-proxy-companion/defaults/main.yml @@ -70,10 +70,11 @@ matrix_synapse_reverse_proxy_companion_container_labels_traefik_enabled: true matrix_synapse_reverse_proxy_companion_container_labels_traefik_docker_network: "{{ matrix_synapse_reverse_proxy_companion_container_network }}" matrix_synapse_reverse_proxy_companion_container_labels_traefik_entrypoints: web-secure matrix_synapse_reverse_proxy_companion_container_labels_traefik_tls_certResolver: default +matrix_synapse_reverse_proxy_companion_container_labels_traefik_hostname: '' # Controls whether labels will be added for handling the root (/) path matrix_synapse_reverse_proxy_companion_container_labels_client_root_enabled: true -matrix_synapse_reverse_proxy_companion_container_labels_client_root_traefik_hostname: '' +matrix_synapse_reverse_proxy_companion_container_labels_client_root_traefik_hostname: "{{ matrix_synapse_reverse_proxy_companion_container_labels_traefik_hostname }}" matrix_synapse_reverse_proxy_companion_container_labels_client_root_traefik_rule: "Host(`{{ matrix_synapse_reverse_proxy_companion_container_labels_client_root_traefik_hostname }}`) && Path(`/`)" matrix_synapse_reverse_proxy_companion_container_labels_client_root_traefik_priority: 0 matrix_synapse_reverse_proxy_companion_container_labels_client_root_traefik_entrypoints: "{{ matrix_synapse_reverse_proxy_companion_container_labels_traefik_entrypoints }}" @@ -84,7 +85,7 @@ matrix_synapse_reverse_proxy_companion_container_labels_client_root_redirection_ # Controls whether labels will be added that expose the Client-Server API. matrix_synapse_reverse_proxy_companion_container_labels_client_api_enabled: true -matrix_synapse_reverse_proxy_companion_container_labels_client_api_traefik_hostname: '' +matrix_synapse_reverse_proxy_companion_container_labels_client_api_traefik_hostname: "{{ matrix_synapse_reverse_proxy_companion_container_labels_traefik_hostname }}" matrix_synapse_reverse_proxy_companion_container_labels_client_api_traefik_path_prefix: /_matrix matrix_synapse_reverse_proxy_companion_container_labels_client_api_traefik_rule: "Host(`{{ matrix_synapse_reverse_proxy_companion_container_labels_client_api_traefik_hostname }}`) && PathPrefix(`{{ matrix_synapse_reverse_proxy_companion_container_labels_client_api_traefik_path_prefix }}`)" matrix_synapse_reverse_proxy_companion_container_labels_client_api_traefik_priority: 0 @@ -96,7 +97,7 @@ matrix_synapse_reverse_proxy_companion_container_labels_client_api_traefik_tls_c # Controls whether labels will be added that expose the Server-Server API (Federation API). matrix_synapse_reverse_proxy_companion_container_labels_federation_api_enabled: "{{ matrix_synapse_reverse_proxy_companion_federation_api_enabled }}" -matrix_synapse_reverse_proxy_companion_container_labels_federation_api_traefik_hostname: '' +matrix_synapse_reverse_proxy_companion_container_labels_federation_api_traefik_hostname: "{{ matrix_synapse_reverse_proxy_companion_container_labels_traefik_hostname }}" matrix_synapse_reverse_proxy_companion_container_labels_federation_api_traefik_path_prefix: /_matrix matrix_synapse_reverse_proxy_companion_container_labels_federation_api_traefik_rule: "Host(`{{ matrix_synapse_reverse_proxy_companion_container_labels_federation_api_traefik_hostname }}`) && PathPrefix(`{{ matrix_synapse_reverse_proxy_companion_container_labels_federation_api_traefik_path_prefix }}`)" matrix_synapse_reverse_proxy_companion_container_labels_federation_api_traefik_priority: 0