Procházet zdrojové kódy

Rename style.json to map_style.json

pull/2276/head
Edgars Voroboks před 3 roky
rodič
revize
93179235a9
5 změnil soubory, kde provedl 4 přidání a 4 odebrání
  1. +1
    -1
      roles/custom/matrix-client-element/defaults/main.yml
  2. +1
    -1
      roles/custom/matrix-client-element/tasks/setup_install.yml
  3. +1
    -1
      roles/custom/matrix-client-element/templates/config.json.j2
  4. +0
    -0
      roles/custom/matrix-client-element/templates/map_style.json.j2
  5. +1
    -1
      roles/custom/matrix-client-element/templates/systemd/matrix-client-element.service.j2

+ 1
- 1
roles/custom/matrix-client-element/defaults/main.yml Zobrazit soubor

@@ -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`).


+ 1
- 1
roles/custom/matrix-client-element/tasks/setup_install.yml Zobrazit soubor

@@ -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 }}"


+ 1
- 1
roles/custom/matrix-client-element/templates/config.json.j2 Zobrazit soubor

@@ -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 }},


roles/custom/matrix-client-element/templates/style.json.j2 → roles/custom/matrix-client-element/templates/map_style.json.j2 Zobrazit soubor


+ 1
- 1
roles/custom/matrix-client-element/templates/systemd/matrix-client-element.service.j2 Zobrazit soubor

@@ -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 \


Načítá se…
Zrušit
Uložit