File tree Expand file tree Collapse file tree 3 files changed +2
-8
lines changed
roles/custom/matrix-synapse
templates/synapse/customizations Expand file tree Collapse file tree 3 files changed +2
-8
lines changed Original file line number Diff line number Diff line change @@ -48,10 +48,6 @@ matrix_synapse_container_image_customizations_enabled: |-
4848# The version that will be installed is specified in `matrix_synapse_ext_synapse_s3_storage_provider_version`.
4949matrix_synapse_container_image_customizations_s3_storage_provider_installation_enabled : " {{ matrix_synapse_ext_synapse_s3_storage_provider_enabled }}"
5050
51- # Controls whether to install an old version of boto3 and botocore, to work around the following issue:
52- # https://github.com/aws/aws-cli/issues/9214
53- matrix_synapse_container_image_customizations_s3_storage_provider_installation_old_boto_workaround_enabled : true
54-
5551# Controls whether custom build steps will be added to the Dockerfile for installing auto-accept-invite module.
5652# The version that will be installed is specified in `matrix_synapse_ext_synapse_auto_accept_invite_version`.
5753matrix_synapse_container_image_customizations_auto_accept_invite_installation_enabled : " {{ matrix_synapse_ext_synapse_auto_accept_invite_enabled }}"
Original file line number Diff line number Diff line change 117117 - {'old': 'matrix_synapse_experimental_features_msc3861_admin_token', 'new': '<removed>'}
118118 - {'old': 'matrix_synapse_experimental_features_msc3861_account_management_url', 'new': '<removed>'}
119119
120+ - {'old': 'matrix_synapse_container_image_customizations_s3_storage_provider_installation_old_boto_workaround_enabled', 'new': '<removed; see https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/4637>'}
121+
120122- name : (Deprecation) Catch and report renamed settings in matrix_synapse_configuration_extension_yaml
121123 ansible.builtin.fail :
122124 msg : >-
Original file line number Diff line number Diff line change @@ -45,12 +45,8 @@ RUN pip install synapse-auto-accept-invite=={{ matrix_synapse_ext_synapse_auto_a
4545{% endif %}
4646
4747{% if matrix_synapse_container_image_customizations_s 3_storage_provider_installation_enabled %}
48- {% if matrix_synapse_container_image_customizations_s 3_storage_provider_installation_old_boto_workaround_enabled %}
49- RUN pip install 'boto3<1 .36.0 ' ' botocore <1.36.0 ' synapse-s3-storage-provider=={{ matrix_synapse_ext_synapse_s3_storage_provider_version }}
50- {% else %}
5148RUN pip install synapse-s3-storage-provider=={{ matrix_synapse_ext_synapse_s3_storage_provider_version }}
5249{% endif %}
53- {% endif %}
5450
5551{% if matrix_synapse_container_image_customizations_templates_enabled %}
5652COPY --from=templates-builder {{ matrix_synapse_container_image_customizations_templates_in_container_base_path }} {{ matrix_synapse_container_image_customizations_templates_in_container_base_path }}
You can’t perform that action at this time.
0 commit comments