From cc1ccf0b3507c6ca55906a9d16ad846185ff8f56 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Tue, 17 Feb 2026 21:20:40 +0900 Subject: [PATCH] Remove `matrix_synapse_container_image_customizations_auto_accept_invite_installation_enabled` Signed-off-by: Suguru Hirahara --- roles/custom/matrix-synapse/defaults/main.yml | 6 ------ .../templates/synapse/customizations/Dockerfile.j2 | 4 ---- 2 files changed, 10 deletions(-) diff --git a/roles/custom/matrix-synapse/defaults/main.yml b/roles/custom/matrix-synapse/defaults/main.yml index 2d6129aac..a717b3085 100644 --- 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: "" - # Controls whether custom build steps will be added to the Dockerfile for customizing the email templates used by Synapse. # # Example usage: diff --git a/roles/custom/matrix-synapse/templates/synapse/customizations/Dockerfile.j2 b/roles/custom/matrix-synapse/templates/synapse/customizations/Dockerfile.j2 index acdcb5752..628bbc92b 100644 --- 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 %}