diff --git a/roles/custom/matrix-base/tasks/validate_config.yml b/roles/custom/matrix-base/tasks/validate_config.yml index 6100dada4..332f252f9 100644 --- a/roles/custom/matrix-base/tasks/validate_config.yml +++ b/roles/custom/matrix-base/tasks/validate_config.yml @@ -31,6 +31,8 @@ - {'old': 'matrix_client_element_e2ee_default', 'new': 'matrix_static_files_file_matrix_client_property_io_element_e2ee_default'} - {'old': 'matrix_client_element_e2ee_secure_backup_required', 'new': 'matrix_static_files_file_matrix_client_property_io_element_e2ee_secure_backup_required'} - {'old': 'matrix_client_element_e2ee_secure_backup_setup_methods', 'new': 'matrix_static_files_file_matrix_client_property_io_element_e2ee_secure_backup_setup_methods'} + - {'old': 'matrix_static_files_file_matrix_client_property_io_element_e2ee_secure_backup_required', 'new': ''} + - {'old': 'matrix_static_files_file_matrix_client_property_io_element_e2ee_secure_backup_setup_methods', 'new': ''} - {'old': 'matrix_container_global_registry_prefix', 'new': ''} - {'old': 'matrix_user_username', 'new': 'matrix_user_name'} - {'old': 'matrix_user_groupname', 'new': 'matrix_group_name'} diff --git a/roles/custom/matrix-static-files/defaults/main.yml b/roles/custom/matrix-static-files/defaults/main.yml index 127f006df..738f6da47 100644 --- a/roles/custom/matrix-static-files/defaults/main.yml +++ b/roles/custom/matrix-static-files/defaults/main.yml @@ -172,10 +172,9 @@ matrix_static_files_file_matrix_client_property_m_tile_server_map_style_url: "" # Controls whether Element related entries (io.element.e2ee) should be added to the client well-known. # By default if any of the following change from their default this would be set to true: -# `matrix_static_files_file_matrix_client_property_io_element_e2ee_default` -# `matrix_static_files_file_matrix_client_property_io_element_e2ee_secure_backup_required` -# `matrix_static_files_file_matrix_client_property_io_element_e2ee_secure_backup_setup_methods` -matrix_static_files_file_matrix_client_property_io_element_e2ee_entries_enabled: "{{ not matrix_static_files_file_matrix_client_property_io_element_e2ee_default or matrix_static_files_file_matrix_client_property_io_element_e2ee_secure_backup_required or matrix_static_files_file_matrix_client_property_io_element_e2ee_secure_backup_setup_methods | length > 0 }}" +# - `matrix_static_files_file_matrix_client_property_io_element_e2ee_default` +# - `matrix_static_files_file_matrix_client_property_io_element_e2ee_force_disable` +matrix_static_files_file_matrix_client_property_io_element_e2ee_entries_enabled: "{{ not matrix_static_files_file_matrix_client_property_io_element_e2ee_default or matrix_static_files_file_matrix_client_property_io_element_e2ee_force_disable }}" # Controls the io.element.e2ee/default property in the /.well-known/matrix/client file, # which instructs Element clients whether they should use End-to-End Encryption by default. @@ -183,19 +182,6 @@ matrix_static_files_file_matrix_client_property_io_element_e2ee_entries_enabled: # See: https://github.com/element-hq/element-web/blob/develop/docs/e2ee.md matrix_static_files_file_matrix_client_property_io_element_e2ee_default: true -# Controls the io.element.e2ee/secure_backup_required property in the /.well-known/matrix/client file, -# which instructs Element clients whether they should require a secure backup set up before they can be used. -# Setting this to true will update `/.well-known/matrix/client` and tell Element clients require a secure backup. -# See: https://github.com/element-hq/element-web/blob/develop/docs/e2ee.md -matrix_static_files_file_matrix_client_property_io_element_e2ee_secure_backup_required: false - -# Controls the io.element.e2ee/secure_backup_setup_methods property in the /.well-known/matrix/client file, -# which instructs Element clients which backup methods from ["key", "passphrase"] should be used. -# When an empty list is provided, Element clients default to using both. -# Setting this to other than empty will update `/.well-known/matrix/client` and tell Element clients which method to use. -# See: https://github.com/element-hq/element-web/blob/develop/docs/e2ee.md -matrix_static_files_file_matrix_client_property_io_element_e2ee_secure_backup_setup_methods: [] - # Controls the io.element.e2ee/force_disable property in the /.well-known/matrix/client file, # which can be set to `true` to instruct Element clients whether to disable End-to-End Encryption by default # and to not show encryption related-settings in room settings. diff --git a/roles/custom/matrix-static-files/templates/public/.well-known/matrix/client.j2 b/roles/custom/matrix-static-files/templates/public/.well-known/matrix/client.j2 index 600e8f4c7..feabaeb2b 100644 --- a/roles/custom/matrix-static-files/templates/public/.well-known/matrix/client.j2 +++ b/roles/custom/matrix-static-files/templates/public/.well-known/matrix/client.j2 @@ -44,8 +44,6 @@ {% if matrix_static_files_file_matrix_client_property_io_element_e2ee_entries_enabled %}, "io.element.e2ee": { "default": {{ matrix_static_files_file_matrix_client_property_io_element_e2ee_default|to_json }}, - "secure_backup_required": {{ matrix_static_files_file_matrix_client_property_io_element_e2ee_secure_backup_required|to_json }}, - "secure_backup_setup_methods": {{ matrix_static_files_file_matrix_client_property_io_element_e2ee_secure_backup_setup_methods|to_json }}, "force_disable": {{ matrix_static_files_file_matrix_client_property_io_element_e2ee_force_disable|to_json }} } {% endif %}