diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index 96a72138d..7a213e033 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -421,8 +421,6 @@ devture_systemd_service_manager_services_list_auto: | + ([{'name': (livekit_server_identifier + '.service'), 'priority': 3000, 'groups': ['matrix', 'livekit-server']}] if livekit_server_enabled else []) + - ([{'name': 'matrix-registration.service', 'priority': 4000, 'groups': ['matrix', 'registration', 'matrix-registration']}] if matrix_registration_enabled else []) - + ([{'name': 'matrix-sygnal.service', 'priority': 800, 'groups': ['matrix', 'sygnal']}] if matrix_sygnal_enabled else []) + ([{'name': 'matrix-goofys.service', 'priority': 800, 'groups': ['matrix', 'goofys']}] if matrix_s3_media_store_enabled else []) @@ -3668,12 +3666,6 @@ postgres_managed_databases_auto: | 'password': matrix_bot_buscarron_database_password, }] if (matrix_bot_buscarron_enabled and matrix_bot_buscarron_database_engine == 'postgres' and matrix_bot_buscarron_database_hostname == postgres_connection_hostname) else []) + - ([{ - 'name': matrix_registration_database_name, - 'username': matrix_registration_database_username, - 'password': matrix_registration_database_password, - }] if (matrix_registration_enabled and matrix_registration_database_engine == 'postgres' and matrix_registration_database_hostname == postgres_connection_hostname) else []) - + ([{ 'name': matrix_appservice_discord_database_name, 'username': matrix_appservice_discord_database_username, @@ -5066,75 +5058,6 @@ grafana_default_home_dashboard_path: |- # ###################################################################### - -###################################################################### -# -# matrix-registration -# -###################################################################### - -matrix_registration_enabled: false - -matrix_registration_scheme: "{{ 'https' if matrix_playbook_ssl_enabled else 'http' }}" -matrix_registration_hostname: "{{ matrix_server_fqn_matrix }}" -matrix_registration_path_prefix: /matrix-registration - -matrix_registration_systemd_required_services_list_auto: | - {{ - ([postgres_identifier ~ '.service'] if (postgres_enabled and matrix_registration_database_hostname == postgres_connection_hostname) else []) - }} - -matrix_registration_docker_image_registry_prefix_upstream: "{{ matrix_container_global_registry_prefix_override if matrix_container_global_registry_prefix_override else matrix_registration_docker_image_registry_prefix_upstream_default }}" - -matrix_registration_container_image_self_build: "{{ matrix_architecture != 'amd64' }}" - -matrix_registration_container_http_host_bind_port: "{{ (matrix_playbook_service_host_bind_interface_prefix ~ '8767') if matrix_playbook_service_host_bind_interface_prefix else '' }}" - -matrix_registration_container_network: "{{ matrix_addons_container_network }}" - -matrix_registration_container_additional_networks_auto: |- - {{ - ( - ([] if matrix_addons_homeserver_container_network == '' else [matrix_addons_homeserver_container_network]) - + - ([postgres_container_network] if (postgres_enabled and matrix_registration_database_hostname == postgres_connection_hostname and matrix_registration_container_network != postgres_container_network) else []) - + - ([matrix_playbook_reverse_proxyable_services_additional_network] if (matrix_playbook_reverse_proxyable_services_additional_network and matrix_registration_container_labels_traefik_enabled) else []) - ) | unique - }} - -matrix_registration_container_labels_traefik_enabled: "{{ matrix_playbook_reverse_proxy_type in ['playbook-managed-traefik', 'other-traefik-container'] }}" -matrix_registration_container_labels_traefik_docker_network: "{{ matrix_playbook_reverse_proxyable_services_additional_network }}" -matrix_registration_container_labels_traefik_entrypoints: "{{ traefik_entrypoint_primary }}" -matrix_registration_container_labels_traefik_tls_certResolver: "{{ traefik_certResolver_primary }}" - -matrix_registration_riot_instance: "{{ (('https://' if matrix_playbook_ssl_enabled else 'http://') + matrix_server_fqn_element) if matrix_client_element_enabled else 'https://element.io/app/' }}" - -matrix_registration_shared_secret: |- - {{ - { - 'synapse': matrix_synapse_registration_shared_secret | default (''), - 'dendrite': matrix_dendrite_client_api_registration_shared_secret | default (''), - 'conduit': '', - 'continuwuity': '', - }[matrix_homeserver_implementation] - }} - -matrix_registration_server_location: "{{ matrix_addons_homeserver_client_api_url }}" - -matrix_registration_api_validate_certs: "{{ matrix_playbook_ssl_enabled }}" - -# Postgres is the default, except if not using internal Postgres server -matrix_registration_database_engine: "{{ 'postgres' if postgres_enabled else 'sqlite' }}" -matrix_registration_database_hostname: "{{ postgres_connection_hostname if postgres_enabled else '' }}" -matrix_registration_database_password: "{{ (matrix_homeserver_generic_secret_key + ':mx.registr.db') | hash('sha512') | to_uuid }}" - -###################################################################### -# -# /matrix-registration -# -###################################################################### - ###################################################################### # # matrix-dendrite diff --git a/roles/custom/matrix_playbook_migration/tasks/validate_config.yml b/roles/custom/matrix_playbook_migration/tasks/validate_config.yml index 3c2682b57..b2f4261f9 100644 --- a/roles/custom/matrix_playbook_migration/tasks/validate_config.yml +++ b/roles/custom/matrix_playbook_migration/tasks/validate_config.yml @@ -777,6 +777,18 @@ The following variables in your configuration need to be removed: {{ lookup('ansible.builtin.varnames', '^matrix_go_skype_bridge_.+', wantlist=True) | join(', ') }} when: "lookup('ansible.builtin.varnames', '^matrix_go_skype_bridge_.+', wantlist=True) | length > 0" +- name: (Deprecation) Catch and report matrix-registration variables + ansible.builtin.fail: + msg: |- + The matrix-registration service was completely removed from the playbook in February 2026. + + Please remove all `matrix_registration_*` variables from your configuration file (vars.yml). + + You may also wish to uninstall the component manually. See `docs/configuring-playbook-matrix-registration.md` for more information. + + The following variables in your configuration need to be removed: {{ lookup('ansible.builtin.varnames', '^matrix_registration_.+', wantlist=True) | join(', ') }} + when: "lookup('ansible.builtin.varnames', '^matrix_registration_.+', wantlist=True) | length > 0" + - name: (Deprecation) Catch and report the Sliding Sync proxy variables ansible.builtin.fail: msg: |-