From 93179235a9296132a82ad08d5df84501594ad00e Mon Sep 17 00:00:00 2001 From: Edgars Voroboks Date: Fri, 18 Nov 2022 15:01:37 +0200 Subject: [PATCH] Rename style.json to map_style.json --- roles/custom/matrix-client-element/defaults/main.yml | 2 +- roles/custom/matrix-client-element/tasks/setup_install.yml | 2 +- roles/custom/matrix-client-element/templates/config.json.j2 | 2 +- .../templates/{style.json.j2 => map_style.json.j2} | 0 .../templates/systemd/matrix-client-element.service.j2 | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename roles/custom/matrix-client-element/templates/{style.json.j2 => map_style.json.j2} (100%) diff --git a/roles/custom/matrix-client-element/defaults/main.yml b/roles/custom/matrix-client-element/defaults/main.yml index aef6b78cc..0bb65ea82 100644 --- a/roles/custom/matrix-client-element/defaults/main.yml +++ b/roles/custom/matrix-client-element/defaults/main.yml @@ -149,7 +149,7 @@ matrix_client_element_location_sharing_enabled: false # # The side-effect of this lookup is that Ansible would even parse the JSON for us, returning a dict. # This is unlike what it does when looking up YAML template files (no automatic parsing there). -matrix_client_element_location_sharing_map_style_default: "{{ lookup('template', 'templates/style.json.j2') }}" +matrix_client_element_location_sharing_map_style_default: "{{ lookup('template', 'templates/map_style.json.j2') }}" # Your custom JSON configuration for Element location sharing map style should go to `matrix_client_element_location_sharing_map_style_extension_json`. # This configuration extends the default starting configuration (`matrix_client_element_location_sharing_map_style_default`). diff --git a/roles/custom/matrix-client-element/tasks/setup_install.yml b/roles/custom/matrix-client-element/tasks/setup_install.yml index c8732050f..cff30f4c0 100644 --- a/roles/custom/matrix-client-element/tasks/setup_install.yml +++ b/roles/custom/matrix-client-element/tasks/setup_install.yml @@ -73,7 +73,7 @@ when: matrix_client_element_location_sharing_enabled | bool ansible.builtin.copy: content: "{{ matrix_client_element_location_sharing_map_style | to_nice_json }}" - dest: "{{ matrix_client_element_data_path }}/style.json" + dest: "{{ matrix_client_element_data_path }}/map_style.json" mode: 0644 owner: "{{ matrix_user_username }}" group: "{{ matrix_user_groupname }}" diff --git a/roles/custom/matrix-client-element/templates/config.json.j2 b/roles/custom/matrix-client-element/templates/config.json.j2 index 8f7e134a7..1ae16f416 100644 --- a/roles/custom/matrix-client-element/templates/config.json.j2 +++ b/roles/custom/matrix-client-element/templates/config.json.j2 @@ -38,7 +38,7 @@ }, {% endif %} {% if matrix_client_element_location_sharing_enabled %} - "map_style_url": "https://{{ matrix_server_fqn_element }}/style.json", + "map_style_url": "https://{{ matrix_server_fqn_element }}/map_style.json", {% endif %} "branding": { "authFooterLinks": {{ matrix_client_element_branding_authFooterLinks|to_json }}, diff --git a/roles/custom/matrix-client-element/templates/style.json.j2 b/roles/custom/matrix-client-element/templates/map_style.json.j2 similarity index 100% rename from roles/custom/matrix-client-element/templates/style.json.j2 rename to roles/custom/matrix-client-element/templates/map_style.json.j2 diff --git a/roles/custom/matrix-client-element/templates/systemd/matrix-client-element.service.j2 b/roles/custom/matrix-client-element/templates/systemd/matrix-client-element.service.j2 index 9a1c8285c..be96cab78 100644 --- a/roles/custom/matrix-client-element/templates/systemd/matrix-client-element.service.j2 +++ b/roles/custom/matrix-client-element/templates/systemd/matrix-client-element.service.j2 @@ -27,7 +27,7 @@ ExecStart={{ devture_systemd_docker_base_host_command_docker }} run --rm --name --mount type=bind,src={{ matrix_client_element_data_path }}/config.json,dst=/app/config.json,ro \ --mount type=bind,src={{ matrix_client_element_data_path }}/config.json,dst=/app/config.{{ matrix_server_fqn_element }}.json,ro \ {% if matrix_client_element_location_sharing_enabled %} - --mount type=bind,src={{ matrix_client_element_data_path }}/style.json,dst=/app/style.json,ro \ + --mount type=bind,src={{ matrix_client_element_data_path }}/map_style.json,dst=/app/map_style.json,ro \ {% endif %} {% if matrix_client_element_embedded_pages_home_path is not none %} --mount type=bind,src={{ matrix_client_element_data_path }}/home.html,dst=/app/home.html,ro \