mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2024-12-24 18:08:28 +01:00
Add support for auto-configuring synapse-admin via /.well-known/matrix/client
Related to: - https://github.com/etkecc/synapse-admin/pull/126 - https://github.com/etkecc/synapse-admin/releases/tag/v0.10.3-etke27 People who wish to disable this and keep their `/.well-known/matrix/client` file tidier can do it via: ```yml matrix_static_files_file_matrix_client_property_cc_etke_synapse_admin_enabled: false ```
This commit is contained in:
parent
260421beb1
commit
0cb3e530d9
@ -5882,6 +5882,10 @@ matrix_static_files_file_matrix_client_property_org_matrix_msc2965_authenticatio
|
||||
matrix_static_files_file_matrix_client_property_m_tile_server_entries_enabled: "{{ matrix_client_element_location_sharing_enabled }}"
|
||||
matrix_static_files_file_matrix_client_property_m_tile_server_map_style_url: "{{ ('https://' if matrix_playbook_ssl_enabled else 'http://') + matrix_server_fqn_element }}/map_style.json"
|
||||
|
||||
# We set this regardless of whether synapse-admin is enabled, because people may wish to use a hosted (externally) synapse-admin installation and still have it auto-configured.
|
||||
# See: https://github.com/etkecc/synapse-admin/pull/126
|
||||
matrix_static_files_file_matrix_client_property_cc_etke_synapse_admin_auto: "{{ matrix_synapse_admin_well_known_client_configuration if matrix_homeserver_implementation == 'synapse' else {} }}"
|
||||
|
||||
matrix_static_files_file_matrix_server_property_m_server: "{{ matrix_server_fqn_matrix_federation }}:{{ matrix_federation_public_port }}"
|
||||
|
||||
matrix_static_files_scheme: "{{ 'https' if matrix_playbook_ssl_enabled else 'http' }}"
|
||||
|
@ -193,6 +193,16 @@ matrix_static_files_file_matrix_client_property_io_element_e2ee_secure_backup_se
|
||||
# See: https://github.com/element-hq/element-web/blob/develop/docs/e2ee.md
|
||||
matrix_static_files_file_matrix_client_property_io_element_e2ee_force_disable: false
|
||||
|
||||
# Controls whether `cc.etke.synapse-admin`-related entries should be added to the client well-known.
|
||||
# By default, if there are entries in `matrix_static_files_file_matrix_client_property_cc_etke_synapse_admin`, we show them (by enabling this).
|
||||
matrix_static_files_file_matrix_client_property_cc_etke_synapse_admin_enabled: "{{ matrix_static_files_file_matrix_client_property_cc_etke_synapse_admin | default({}) | dict2items | length > 0 }}"
|
||||
|
||||
# Controls the cc.etke.synapse-admin property in the /.well-known/matrix/client file.
|
||||
# See `matrix_static_files_file_matrix_client_property_cc_etke_synapse_admin_entries_enabled`
|
||||
matrix_static_files_file_matrix_client_property_cc_etke_synapse_admin: "{{ matrix_static_files_file_matrix_client_property_cc_etke_synapse_admin_auto | combine(matrix_static_files_file_matrix_client_property_cc_etke_synapse_admin_custom, recursive=True) }}"
|
||||
matrix_static_files_file_matrix_client_property_cc_etke_synapse_admin_auto: {}
|
||||
matrix_static_files_file_matrix_client_property_cc_etke_synapse_admin_custom: {}
|
||||
|
||||
# Default /.well-known/matrix/client configuration template which covers the generic use case.
|
||||
# You can customize it by controlling the various variables inside it.
|
||||
#
|
||||
|
@ -54,4 +54,7 @@
|
||||
"default": {{ matrix_static_files_file_matrix_client_property_io_element_e2ee_default|to_json }}
|
||||
}
|
||||
{% endif %}
|
||||
{% if matrix_static_files_file_matrix_client_property_cc_etke_synapse_admin_enabled %},
|
||||
"cc.etke.synapse-admin": {{ matrix_static_files_file_matrix_client_property_cc_etke_synapse_admin | to_json }}
|
||||
{% endif %}
|
||||
}
|
||||
|
7
roles/custom/matrix-synapse-admin/vars/main.yml
Normal file
7
roles/custom/matrix-synapse-admin/vars/main.yml
Normal file
@ -0,0 +1,7 @@
|
||||
---
|
||||
|
||||
# Configuration that can be injected into a `/.well-known/matrix/client` file,
|
||||
# to let synapse-admin users use any synapse-admin instance and still get synapse-admin auto-configured correctly.
|
||||
# See: https://github.com/etkecc/synapse-admin/pull/126
|
||||
matrix_synapse_admin_well_known_client_configuration:
|
||||
asManagedUsers: "{{ matrix_synapse_admin_config_asManagedUsers }}"
|
Loading…
Reference in New Issue
Block a user