mirror/matrix-docker-ansible-deploy
1
0
Fork 0
mirror of https://github.com/spantaleev/matrix-docker-ansible-deploy.git synced 2025-04-07 13:05:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

synapse-admin: remove deprecated vars, introduce matrix_synapse_admin_configuration_extension_json_auto

Browse Source
This commit is contained in:
Aine 2024-12-02 01:23:29 +02:00
parent bc1849d7ff
commit dd31bf0a0a
No known key found for this signature in database
GPG Key ID: 34969C908CCA2804
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
roles/custom/matrix-synapse-admin/defaults/main.yml
View File

@ -149,7 +149,6 @@ matrix_synapse_admin_path_prefix: /synapse-admin
matrix_synapse_admin_configuration_default: matrix_synapse_admin_configuration_default:
restrictBaseUrl: "{{ matrix_synapse_admin_config_restrictBaseUrl }}" restrictBaseUrl: "{{ matrix_synapse_admin_config_restrictBaseUrl }}"
asManagedUsers: "{{ matrix_synapse_admin_config_asManagedUsers }}" asManagedUsers: "{{ matrix_synapse_admin_config_asManagedUsers }}"
supportURL: "{{ matrix_synapse_admin_config_supportURL }}"
menu: "{{ matrix_synapse_admin_config_menu }}" menu: "{{ matrix_synapse_admin_config_menu }}"
# Your custom JSON configuration for synapse-admin should go to `matrix_synapse_admin_configuration_extension_json`. # Your custom JSON configuration for synapse-admin should go to `matrix_synapse_admin_configuration_extension_json`.
@ -169,7 +168,10 @@ matrix_synapse_admin_configuration_default:
# } # }
matrix_synapse_admin_configuration_extension_json: '{}' matrix_synapse_admin_configuration_extension_json: '{}'
matrix_synapse_admin_configuration_extension: "{{ matrix_synapse_admin_configuration_extension_json | from_json if matrix_synapse_admin_configuration_extension_json | from_json is mapping else {} }}" # This is similar to `matrix_synapse_admin_configuration_extension_json`, but intended for use by playbook or group vars
matrix_synapse_admin_configuration_extension_json_auto: {}
matrix_synapse_admin_configuration_extension: "{{ matrix_synapse_admin_configuration_extension_json_auto | combine(matrix_synapse_admin_configuration_extension_json | from_json if matrix_synapse_admin_configuration_extension_json | from_json is mapping else {}, recursive=True) }}"
# Holds the final synapse-admin configuration (a combination of the default and its extension). # Holds the final synapse-admin configuration (a combination of the default and its extension).
# You most likely don't need to touch this variable. Instead, see `matrix_synapse_admin_configuration_default`. # You most likely don't need to touch this variable. Instead, see `matrix_synapse_admin_configuration_default`.
@ -194,10 +196,6 @@ matrix_synapse_admin_config_restrictBaseUrl: "{{ [matrix_homeserver_url] }}" #
# ] # ]
matrix_synapse_admin_config_menu: [] matrix_synapse_admin_config_menu: []
# Controls the supportURL configuration setting, which, if defined, replaces the default link to the Synapse Admin GitHub repository.
# DEPRECATED: use matrix_synapse_admin_config_menu instead (migrated automatically).
matrix_synapse_admin_config_supportURL: '' # noqa var-naming
# Controls the asManagedUsers configuration setting (managed by playbook), which, if defined, # Controls the asManagedUsers configuration setting (managed by playbook), which, if defined,
# restricts modifications of the specified users (e.g., bridge-managed). # restricts modifications of the specified users (e.g., bridge-managed).
# You should use JS regex syntax to match the user IDs. # You should use JS regex syntax to match the user IDs.