Browse Source

fix: remove deprecated convert_data option from template lookups

pull/5269/head
Matěj Cepl 2 weeks ago
parent
commit
5f97442fe8
No known key found for this signature in database GPG Key ID: 79205802880BC9D8
4 changed files with 7 additions and 7 deletions
  1. +1
    -1
      roles/custom/matrix-bridge-appservice-kakaotalk/defaults/main.yml
  2. +2
    -2
      roles/custom/matrix-client-schildichat/defaults/main.yml
  3. +1
    -1
      roles/custom/matrix-corporal/defaults/main.yml
  4. +3
    -3
      roles/custom/matrix-static-files/defaults/main.yml

+ 1
- 1
roles/custom/matrix-bridge-appservice-kakaotalk/defaults/main.yml View File

@@ -181,7 +181,7 @@ matrix_appservice_kakaotalk_configuration: "{{ matrix_appservice_kakaotalk_confi
#
# 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_appservice_kakaotalk_node_configuration_default: "{{ lookup('template', 'templates/node-config.json.j2', convert_data=False) | from_json }}"
matrix_appservice_kakaotalk_node_configuration_default: "{{ lookup('template', 'templates/node-config.json.j2') | from_json }}"

# Your custom JSON configuration for appservice-kakaotalk-node should go to `matrix_appservice_kakaotalk_node_configuration_extension_json`.
# This configuration extends the default starting configuration (`matrix_appservice_kakaotalk_node_configuration_default`).


+ 2
- 2
roles/custom/matrix-client-schildichat/defaults/main.yml View File

@@ -225,7 +225,7 @@ matrix_client_schildichat_setting_defaults_custom_themes: [] # noqa var-naming
#
# 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_schildichat_configuration_default: "{{ lookup('template', 'templates/config.json.j2', convert_data=False) | from_json }}"
matrix_client_schildichat_configuration_default: "{{ lookup('template', 'templates/config.json.j2') | from_json }}"

# Your custom JSON configuration for SchildiChat Web should go to `matrix_client_schildichat_configuration_extension_json`.
# This configuration extends the default starting configuration (`matrix_client_schildichat_configuration_default`).
@@ -263,7 +263,7 @@ matrix_client_schildichat_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_schildichat_location_sharing_map_style_default: "{{ lookup('template', 'templates/map_style.json.j2', convert_data=False) | from_json }}"
matrix_client_schildichat_location_sharing_map_style_default: "{{ lookup('template', 'templates/map_style.json.j2') | from_json }}"

# Your custom JSON configuration for SchildiChat location sharing map style should go to `matrix_client_schildichat_location_sharing_map_style_extension_json`.
# This configuration extends the default starting configuration (`matrix_client_schildichat_location_sharing_map_style_default`).


+ 1
- 1
roles/custom/matrix-corporal/defaults/main.yml View File

@@ -151,7 +151,7 @@ matrix_corporal_debug: 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_corporal_configuration_default: "{{ lookup('template', 'templates/config.json.j2', convert_data=False) | from_json }}"
matrix_corporal_configuration_default: "{{ lookup('template', 'templates/config.json.j2') | from_json }}"

# Your custom JSON configuration for Corporal should go to `matrix_corporal_configuration_extension_json`.
# This configuration extends the default starting configuration (`matrix_corporal_configuration_default`).


+ 3
- 3
roles/custom/matrix-static-files/defaults/main.yml View File

@@ -216,7 +216,7 @@ matrix_static_files_file_matrix_client_property_org_matrix_msc4143_rtc_foci_cust
#
# For a more advanced customization, you can extend the default (see `matrix_static_files_file_matrix_client_configuration_extension_json`)
# or completely replace this variable with your own template.
matrix_static_files_file_matrix_client_configuration_json: "{{ lookup('template', 'templates/public/.well-known/matrix/client.j2', convert_data=False) | from_json }}"
matrix_static_files_file_matrix_client_configuration_json: "{{ lookup('template', 'templates/public/.well-known/matrix/client.j2') | from_json }}"

# Your custom JSON configuration for /.well-known/matrix/client should go to `matrix_static_files_file_matrix_client_configuration_extension_json`.
# This configuration extends the default starting configuration (`matrix_static_files_file_matrix_client_configuration_extension_json`).
@@ -270,7 +270,7 @@ matrix_static_files_file_matrix_server_property_m_server: ''
#
# For a more advanced customization, you can extend the default (see `matrix_static_files_file_matrix_server_configuration_extension_json`)
# or completely replace this variable with your own template.
matrix_static_files_file_matrix_server_configuration_json: "{{ lookup('template', 'templates/public/.well-known/matrix/server.j2', convert_data=False) | from_json }}"
matrix_static_files_file_matrix_server_configuration_json: "{{ lookup('template', 'templates/public/.well-known/matrix/server.j2') | from_json }}"

# Your custom JSON configuration for /.well-known/matrix/server should go to `matrix_static_files_file_matrix_server_configuration_extension_json`.
# This configuration extends the default starting configuration (`matrix_static_files_file_matrix_server_configuration_extension_json`).
@@ -326,7 +326,7 @@ matrix_static_files_file_matrix_support_property_m_support_page: ""
#
# For a more advanced customization, you can extend the default (see `matrix_static_files_file_matrix_support_configuration_extension_json`)
# or completely replace this variable with your own template.
matrix_static_files_file_matrix_support_configuration_json: "{{ lookup('template', 'templates/public/.well-known/matrix/support.j2', convert_data=False) | from_json }}"
matrix_static_files_file_matrix_support_configuration_json: "{{ lookup('template', 'templates/public/.well-known/matrix/support.j2') | from_json }}"

# Your custom JSON configuration for /.well-known/matrix/support should go to `matrix_static_files_file_matrix_support_configuration_extension_json`.
# This configuration extends the default starting configuration (`matrix_static_files_file_matrix_support_configuration_extension_json`).


Loading…
Cancel
Save