Do not hardcode https:// in all remaining places, refer to matrix_static_files_scheme

Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/3333
This commit is contained in:
Slavi Pantaleev
2024-05-25 16:14:26 +03:00
parent 3bf488fb16
commit 7891268873
25 changed files with 59 additions and 33 deletions

View File

@ -123,6 +123,7 @@ matrix_client_schildichat_floc_optout_enabled: true
# See: `matrix_client_schildichat_http_header_strict_transport_security`
matrix_client_schildichat_hsts_preload_enabled: false
matrix_client_schildichat_scheme: https
# The hostname at which schildichat is served.
matrix_client_schildichat_hostname: "{{ matrix_server_fqn_schildichat }}"
@ -134,6 +135,7 @@ matrix_client_schildichat_path_prefix: /
matrix_client_schildichat_default_server_name: "{{ matrix_domain }}"
matrix_client_schildichat_default_hs_url: ""
matrix_client_schildichat_default_is_url: ~
matrix_client_schildichat_map_style_url: "{{ matrix_client_schildichat_scheme }}://{{ matrix_client_schildichat_hostname }}/map_style.json"
matrix_client_schildichat_disable_custom_urls: true
matrix_client_schildichat_disable_guests: true
matrix_client_schildichat_integrations_ui_url: "https://scalar.vector.im/"

View File

@ -1,7 +1,7 @@
---
- ansible.builtin.set_fact:
matrix_client_schildichat_url_endpoint_public: "https://{{ matrix_server_fqn_schildichat }}/config.json"
matrix_client_schildichat_url_endpoint_public: "{{ matrix_client_schildichat_scheme }}://{{ matrix_client_schildichat_hostname }}/config.json"
- name: Check schildichat
ansible.builtin.uri:

View File

@ -38,7 +38,7 @@
},
{% endif %}
{% if matrix_client_schildichat_location_sharing_enabled %}
"map_style_url": "https://{{ matrix_server_fqn_schildichat }}/map_style.json",
"map_style_url": {{ matrix_client_schildichat_map_style_url | to_json }},
{% endif %}
"branding": {
"auth_footer_links": {{ matrix_client_schildichat_branding_auth_footer_links | to_json }},