Remove synapse-auto-invite-accept (#4943)

* Remove `matrix_synapse_ext_synapse_auto_accept_invite_worker_to_run_on` Signed-off-by: Suguru Hirahara <did🔑z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5> * Remove `matrix_synapse_ext_synapse_auto_accept_invite_accept_invites_only_direct_messages` Signed-off-by: Suguru Hirahara <did🔑z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5> * Remove `matrix_synapse_ext_synapse_auto_accept_invite_enabled` Signed-off-by: Suguru Hirahara <did🔑z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5> * Remove `matrix_synapse_container_image_customizations_auto_accept_invite_installation_enabled` Signed-off-by: Suguru Hirahara <did🔑z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5> * Remove `matrix_synapse_ext_synapse_auto_accept_invite_version` Signed-off-by: Suguru Hirahara <did🔑z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5> * Remove `matrix_synapse_ext_synapse_auto_accept_invite_accept_invites_only_from_local_users` Signed-off-by: Suguru Hirahara <did🔑z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5> * Remove roles/custom/matrix-synapse/tasks/ext/synapse-auto-accept-invite Signed-off-by: Suguru Hirahara <did🔑z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5> * Update README.md Signed-off-by: Suguru Hirahara <did🔑z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5> * Update container-images.md Signed-off-by: Suguru Hirahara <did🔑z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5> * Update configuring-playbook.md Signed-off-by: Suguru Hirahara <did🔑z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5> * Update configuring-playbook-synapse-auto-accept-invite.md Reuse bf744319e0/docs/configuring-playbook-sliding-sync-proxy.md Signed-off-by: Suguru Hirahara <did🔑z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5> * Update validate_config.yml Signed-off-by: Suguru Hirahara <did🔑z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5> * Update CHANGELOG.md Signed-off-by: Suguru Hirahara <did🔑z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5> --------- Signed-off-by: Suguru Hirahara <did🔑z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5> Co-authored-by: Suguru Hirahara <did🔑z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5>
2026-02-28 01:43:10 +00:00 · 2026-02-17 12:37:46 +00:00
parent bf744319e0
commit e5b48f22db
11 changed files with 37 additions and 115 deletions
--- a/roles/custom/matrix-synapse/defaults/main.yml
+++ b/roles/custom/matrix-synapse/defaults/main.yml
@@ -40,18 +40,12 @@ matrix_synapse_container_image_customizations_enabled: |-
    matrix_synapse_container_image_customizations_s3_storage_provider_installation_enabled
    or
    matrix_synapse_container_image_customizations_templates_enabled
-    or
-    matrix_synapse_container_image_customizations_auto_accept_invite_installation_enabled
  }}

 # Controls whether custom build steps will be added to the Dockerfile for installing s3-storage-provider.
 # The version that will be installed is specified in `matrix_synapse_ext_synapse_s3_storage_provider_version`.
 matrix_synapse_container_image_customizations_s3_storage_provider_installation_enabled: "{{ matrix_synapse_ext_synapse_s3_storage_provider_enabled }}"

-# Controls whether custom build steps will be added to the Dockerfile for installing auto-accept-invite module.
-# The version that will be installed is specified in `matrix_synapse_ext_synapse_auto_accept_invite_version`.
-matrix_synapse_container_image_customizations_auto_accept_invite_installation_enabled: "{{ matrix_synapse_ext_synapse_auto_accept_invite_enabled }}"
-
 # Controls whether custom build steps will be added to the Dockerfile for customizing the email templates used by Synapse.
 #
 # Example usage:
@@ -665,7 +659,6 @@ matrix_synapse_auto_join_mxid_localpart: ''

 # Controls whether room invites will be accepted on behalf of users.
 # See: https://element-hq.github.io/synapse/latest/usage/configuration/config_documentation.html#auto-accept-invites
-# This should not be used together with the `synapse_auto_accept_invite` module (see `matrix_synapse_ext_synapse_auto_accept_invite_enabled`).
 # Also see:
 # - `matrix_synapse_auto_accept_invites_only_for_direct_messages`
 # - `matrix_synapse_auto_accept_invites_only_from_local_users`
@@ -1550,23 +1543,6 @@ matrix_synapse_ext_synapse_s3_storage_provider_migrate_systemd_required_services
 # List of systemd services that matrix-synapse-s3-storage-provider-migrate.service wants
 matrix_synapse_ext_synapse_s3_storage_provider_migrate_systemd_wanted_services_list: []

-# Synapse module to automatically accept room invites.
-#
-# Since Synapse v1.109.0 (https://github.com/element-hq/synapse/pull/17147),
-# this functionality has been merged into Synapse. See `matrix_synapse_auto_accept_invites_enabled`.
-#
-# See: https://github.com/matrix-org/synapse-auto-accept-invite
-# Installing it requires building a customized Docker image for Synapse (see `matrix_synapse_container_image_customizations_enabled`).
-# Enabling this will enable customizations and inject the appropriate Dockerfile clauses for installing synapse-auto-accept-invite.
-matrix_synapse_ext_synapse_auto_accept_invite_enabled: false
-matrix_synapse_ext_synapse_auto_accept_invite_version: 1.1.3
-# Specifies whether only direct messages (1:1 rooms) will be auto accepted.
-matrix_synapse_ext_synapse_auto_accept_invite_accept_invites_only_direct_messages: false
-# Specifies whether only invites from local users will be auto accepted.
-matrix_synapse_ext_synapse_auto_accept_invite_accept_invites_only_from_local_users: false
-# When Synapse workers enabled it is possible (but not required) to assign a worker to run this module on (null = main process).
-matrix_synapse_ext_synapse_auto_accept_invite_worker_to_run_on: null
-
 # Specifies whether an external media repository is enabled.
 # If it is, the Synapse media repo and media-repo workers will be disabled automatically.
 matrix_synapse_ext_media_repo_enabled: false
--- a/roles/custom/matrix-synapse/tasks/ext/setup_install.yml
+++ b/roles/custom/matrix-synapse/tasks/ext/setup_install.yml
@@ -91,13 +91,3 @@

    - when: matrix_synapse_ext_synapse_s3_storage_provider_enabled | bool
      ansible.builtin.include_tasks: "{{ role_path }}/tasks/ext/s3-storage-provider/setup_install.yml"
-
-# synapse-auto-accept-invite
- tags:
-    - setup-all
-    - setup-synapse
-    - install-all
-    - install-synapse
-  block:
-    - when: matrix_synapse_ext_synapse_auto_accept_invite_enabled | bool
-      ansible.builtin.include_tasks: "{{ role_path }}/tasks/ext/synapse-auto-accept-invite/setup_install.yml"
--- a/roles/custom/matrix-synapse/tasks/ext/synapse-auto-accept-invite/setup_install.yml
+++ b/roles/custom/matrix-synapse/tasks/ext/synapse-auto-accept-invite/setup_install.yml
@@ -1,28 +0,0 @@
-# SPDX-FileCopyrightText: 2024 MDAD project contributors
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
---
-
- ansible.builtin.set_fact:
-    matrix_synapse_modules: |
-      {{
-        matrix_synapse_modules | default([])
-        +
-        [
-          {
-            "module": "synapse_auto_accept_invite.InviteAutoAccepter",
-            "config": {
-              "accept_invites_only_for_direct_messages": matrix_synapse_ext_synapse_auto_accept_invite_accept_invites_only_direct_messages,
-              "accept_invites_only_from_local_users": matrix_synapse_ext_synapse_auto_accept_invite_accept_invites_only_from_local_users,
-              "worker_to_run_on": matrix_synapse_ext_synapse_auto_accept_invite_worker_to_run_on,
-          },
-        }]
-      }}
-
-    matrix_synapse_additional_loggers_auto: >
-      {{
-        matrix_synapse_additional_loggers_auto
-        +
-        [{'name': 'synapse_auto_accept_invite', 'level': 'INFO'}]
-      }}
--- a/roles/custom/matrix-synapse/tasks/validate_config.yml
+++ b/roles/custom/matrix-synapse/tasks/validate_config.yml
@@ -151,18 +151,6 @@
      with_items:
        - matrix_synapse_container_image_customizations_templates_git_repository_keyscan_hostname

-
- name: Fail when auto-accept-invite enabled as a native feature and a module at the same time
-  ansible.builtin.fail:
-    msg: >-
-      Your configuration enables the auto-accept invites feature both as a native Synapse feature (`matrix_synapse_auto_accept_invites_enabled`) and a 3rd party module (`matrix_synapse_ext_synapse_auto_accept_invite_enabled`).
-      This is unnecessary, since they both do the same and the native feature is built on top of the 3rd party module anyway.
-      Enabling both at the same time will lead to issues.
-      We recommend leaving `matrix_synapse_auto_accept_invites_enabled` in your configuration and removing `matrix_synapse_ext_synapse_auto_accept_invite_enabled`.
-  when:
-    - matrix_synapse_auto_accept_invites_enabled
-    - matrix_synapse_ext_synapse_auto_accept_invite_enabled
-
 - name: Fail if known Synapse password provider modules are enabled when auth is delegated to Matrix Authentication Service
  ansible.builtin.fail:
    msg: "When Synapse is delegating authentication to Matrix Authentication Service (`matrix_synapse_matrix_authentication_service_enabled: true`), it does not make sense to enable password provider modules, because it is not Synapse that is handling authentication. Please disable {{ item }} before enabling Matrix Authentication Service integration for Synapse. Synapse will refuse to start otherwise."
--- a/roles/custom/matrix-synapse/templates/synapse/customizations/Dockerfile.j2
+++ b/roles/custom/matrix-synapse/templates/synapse/customizations/Dockerfile.j2
@@ -40,10 +40,6 @@ RUN chown -R {{ matrix_synapse_uid }}:{{ matrix_synapse_gid }} {{ matrix_synapse

 FROM {{ matrix_synapse_docker_image }}

-{% if matrix_synapse_container_image_customizations_auto_accept_invite_installation_enabled %}
-RUN pip install synapse-auto-accept-invite=={{ matrix_synapse_ext_synapse_auto_accept_invite_version }}
-{% endif %}
-
 {% if matrix_synapse_container_image_customizations_s3_storage_provider_installation_enabled %}
 RUN pip install synapse-s3-storage-provider=={{ matrix_synapse_ext_synapse_s3_storage_provider_version }}
 {% endif %}
--- a/roles/custom/matrix_playbook_migration/tasks/validate_config.yml
+++ b/roles/custom/matrix_playbook_migration/tasks/validate_config.yml
@@ -831,3 +831,15 @@

      The following variables in your configuration need to be removed: {{ lookup('ansible.builtin.varnames', '^matrix_sliding_sync_.+', wantlist=True) | join(', ') }}
  when: "lookup('ansible.builtin.varnames', '^matrix_sliding_sync_.+', wantlist=True) | length > 0"
+
+- name: (Deprecation) Catch and report the synapse-auto-invite-accept variables
+  ansible.builtin.fail:
+    msg: |-
+      synapse-auto-invite-accept was completely removed from the playbook in February 2026, as the same functionality is available since Synapse v1.109.0.
+
+      Please remove all `matrix_synapse_ext_synapse_auto_accept_invite_*` variables from your configuration file (vars.yml).
+
+      To enable the native feature, see `docs/configuring-playbook-synapse-auto-accept-invite.md` for more information.
+
+      The following variables in your configuration need to be removed: {{ lookup('ansible.builtin.varnames', '^matrix_synapse_ext_synapse_auto_accept_invite_.+', wantlist=True) | join(', ') }}
+  when: "lookup('ansible.builtin.varnames', '^matrix_synapse_ext_synapse_auto_accept_invite_.+', wantlist=True) | length > 0"