From b9427154694b911fecefcd705fdf7452d9adfce9 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Thu, 19 Mar 2026 23:30:44 +0200 Subject: [PATCH] fix(self-check): respect path_prefix in web client self-check URLs Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/5051 Co-Authored-By: Claude Opus 4.6 (1M context) --- roles/custom/matrix-client-element/tasks/self_check.yml | 3 --- roles/custom/matrix-client-element/vars/main.yml | 2 ++ roles/custom/matrix-client-fluffychat/tasks/self_check.yml | 3 --- roles/custom/matrix-client-fluffychat/vars/main.yml | 7 +++++++ .../custom/matrix-client-schildichat/tasks/self_check.yml | 3 --- roles/custom/matrix-client-schildichat/vars/main.yml | 2 ++ 6 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 roles/custom/matrix-client-fluffychat/vars/main.yml diff --git a/roles/custom/matrix-client-element/tasks/self_check.yml b/roles/custom/matrix-client-element/tasks/self_check.yml index b2e70a5d1..67cf4905f 100644 --- a/roles/custom/matrix-client-element/tasks/self_check.yml +++ b/roles/custom/matrix-client-element/tasks/self_check.yml @@ -5,9 +5,6 @@ --- -- ansible.builtin.set_fact: - matrix_client_element_url_endpoint_public: "{{ matrix_client_element_scheme }}://{{ matrix_client_element_hostname }}/config.json" - - name: Check Element Web ansible.builtin.uri: url: "{{ matrix_client_element_url_endpoint_public }}" diff --git a/roles/custom/matrix-client-element/vars/main.yml b/roles/custom/matrix-client-element/vars/main.yml index f332b4312..1e53af492 100644 --- a/roles/custom/matrix-client-element/vars/main.yml +++ b/roles/custom/matrix-client-element/vars/main.yml @@ -5,3 +5,5 @@ --- matrix_client_element_embedded_pages_home_url: "{{ ('' if matrix_client_element_embedded_pages_home_path is none else 'home.html') }}" + +matrix_client_element_url_endpoint_public: "{{ matrix_client_element_scheme }}://{{ matrix_client_element_hostname }}{{ matrix_client_element_path_prefix }}{% if matrix_client_element_path_prefix != '/' %}/{% endif %}config.json" diff --git a/roles/custom/matrix-client-fluffychat/tasks/self_check.yml b/roles/custom/matrix-client-fluffychat/tasks/self_check.yml index 12f8bd298..b43f1fe88 100644 --- a/roles/custom/matrix-client-fluffychat/tasks/self_check.yml +++ b/roles/custom/matrix-client-fluffychat/tasks/self_check.yml @@ -4,9 +4,6 @@ --- -- ansible.builtin.set_fact: - matrix_client_fluffychat_url_endpoint_public: "{{ matrix_client_fluffychat_scheme }}://{{ matrix_client_fluffychat_hostname }}/" - - name: Check FluffyChat Web ansible.builtin.uri: url: "{{ matrix_client_fluffychat_url_endpoint_public }}" diff --git a/roles/custom/matrix-client-fluffychat/vars/main.yml b/roles/custom/matrix-client-fluffychat/vars/main.yml new file mode 100644 index 000000000..66cdb134e --- /dev/null +++ b/roles/custom/matrix-client-fluffychat/vars/main.yml @@ -0,0 +1,7 @@ +# SPDX-FileCopyrightText: 2025 Slavi Pantaleev +# +# SPDX-License-Identifier: AGPL-3.0-or-later + +--- + +matrix_client_fluffychat_url_endpoint_public: "{{ matrix_client_fluffychat_scheme }}://{{ matrix_client_fluffychat_hostname }}{{ matrix_client_fluffychat_path_prefix }}{% if matrix_client_fluffychat_path_prefix != '/' %}/{% endif %}" diff --git a/roles/custom/matrix-client-schildichat/tasks/self_check.yml b/roles/custom/matrix-client-schildichat/tasks/self_check.yml index 255975cad..8c8d1c9c0 100644 --- a/roles/custom/matrix-client-schildichat/tasks/self_check.yml +++ b/roles/custom/matrix-client-schildichat/tasks/self_check.yml @@ -6,9 +6,6 @@ --- -- ansible.builtin.set_fact: - matrix_client_schildichat_url_endpoint_public: "{{ matrix_client_schildichat_scheme }}://{{ matrix_client_schildichat_hostname }}/config.json" - - name: Check SchildiChat Web ansible.builtin.uri: url: "{{ matrix_client_schildichat_url_endpoint_public }}" diff --git a/roles/custom/matrix-client-schildichat/vars/main.yml b/roles/custom/matrix-client-schildichat/vars/main.yml index d338feb65..e04c86290 100644 --- a/roles/custom/matrix-client-schildichat/vars/main.yml +++ b/roles/custom/matrix-client-schildichat/vars/main.yml @@ -5,3 +5,5 @@ --- matrix_client_schildichat_embedded_pages_home_url: "{{ ('' if matrix_client_schildichat_embedded_pages_home_path is none else 'home.html') }}" + +matrix_client_schildichat_url_endpoint_public: "{{ matrix_client_schildichat_scheme }}://{{ matrix_client_schildichat_hostname }}{{ matrix_client_schildichat_path_prefix }}{% if matrix_client_schildichat_path_prefix != '/' %}/{% endif %}config.json"