Remove matrix_synapse_container_image_customizations_s3_storage_provider_installation_old_boto_workaround_enabled

Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/4637

We no longer need to boto workaround since s3-storage-provider got
upgraded to v1.6.0 in https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/4635

roles/custom/matrix-bridge-mautrix-discord/defaults/main.yml

@@ -59,7 +59,7 @@ matrix_mautrix_discord_bridge_avatar_proxy_key: ''
 matrix_mautrix_discord_bridge_username_template: "{% raw %}discord_{{.}}{% endraw %}"
 
 # Displayname template for Discord users. This is also used as the room name in DMs if private_chat_portal_meta is enabled.
-matrix_mautrix_discord_bridge_displayname_template: "{% raw %}{{or .GlobalName .Username}}{{if .Bot}} (bot){{end}}{% endraw %}"
+matrix_mautrix_discord_bridge_displayname_template: "{% raw %}{{or .GlobalName .Username}}{{if .Bot}} (bot){{end}} (Discord){% endraw %}"
 
 # Displayname template for Discord channels (bridged as rooms, or spaces when type=4).
 matrix_mautrix_discord_bridge_channel_name_template: "{% raw %}{{if or (eq .Type 3) (eq .Type 4)}}{{.Name}}{{else}}#{{.Name}}{{end}}{% endraw %}"

roles/custom/matrix-bridge-mautrix-signal/defaults/main.yml

@@ -57,7 +57,7 @@ matrix_mautrix_signal_command_prefix: "!signal"
 # {{.PhoneNumber}} - The phone number of the user.
 # {{.UUID}} - The UUID of the Signal user.
 # {{.AboutEmoji}} - The emoji set by the user in their profile.
-matrix_mautrix_signal_network_displayname_template: "{% raw %}{{or .ProfileName .PhoneNumber 'Unknown user'}} (Signal){% endraw %}"
+matrix_mautrix_signal_network_displayname_template: '{% raw %}{{or .ProfileName .PhoneNumber "Unknown user"}} (Signal){% endraw %}'
 
 matrix_mautrix_signal_bridge_permissions: |
   {{

roles/custom/matrix-bridge-mautrix-signal/templates/config.yaml.j2

@@ -2,13 +2,6 @@
 # Network-specific config options
 network:
     # Displayname template for Signal users.
-    # {% raw %}
-    # {{.ProfileName}} - The Signal profile name set by the user.
-    # {{.ContactName}} - The name for the user from your phone's contact list. This is not safe on multi-user instances.
-    # {{.PhoneNumber}} - The phone number of the user.
-    # {{.UUID}} - The UUID of the Signal user.
-    # {{.AboutEmoji}} - The emoji set by the user in their profile.
-    # {% endraw %}
     displayname_template: {{ matrix_mautrix_signal_network_displayname_template | to_json }}
     # Should avatars from the user's contact list be used? This is not safe on multi-user instances.
     use_contact_avatars: false

roles/custom/matrix-bridge-steam/defaults/main.yml

@@ -48,7 +48,7 @@ matrix_steam_bridge_public_media_hash_length: 32
 # Displayname template for Steam users
 # {{ .DisplayName }} is replaced with the display name of the Steam user
 # {{ .Username }} is replaced with the username of the Steam user
-matrix_steam_bridge_network_displayname_template: "{% raw %}{{ .DisplayName }}{% endraw %} (Steam)"
+matrix_steam_bridge_network_displayname_template: "{% raw %}{{ .DisplayName }} (Steam){% endraw %}"
 
 matrix_steam_bridge_command_prefix: "!steam"
 

roles/custom/matrix-bridge-steam/templates/config.yaml.j2

@@ -7,10 +7,6 @@ network:
     get_proxy_url: null
 
     # Displayname template for Steam users.
-    # {% raw %}
-    # {{ .DisplayName }} is replaced with the display name of the Steam user.
-    # {{ .Username }} is replaced with the username of the Steam user.
-    # {% endraw %}
     displayname_template: {{ matrix_steam_bridge_network_displayname_template | to_json }}
 
     # Maximum number of conversations to sync on startup

roles/custom/matrix-synapse/defaults/main.yml

@@ -16,7 +16,7 @@ matrix_synapse_enabled: true
 matrix_synapse_github_org_and_repo: element-hq/synapse
 
 # renovate: datasource=docker depName=ghcr.io/element-hq/synapse
-matrix_synapse_version: v1.139.2
+matrix_synapse_version: v1.140.0
 
 matrix_synapse_username: ''
 matrix_synapse_uid: ''
@@ -48,10 +48,6 @@ matrix_synapse_container_image_customizations_enabled: |-
 # 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 to install an old version of boto3 and botocore, to work around the following issue:
-# https://github.com/aws/aws-cli/issues/9214
-matrix_synapse_container_image_customizations_s3_storage_provider_installation_old_boto_workaround_enabled: true
-
 # 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 }}"
@@ -1477,7 +1473,7 @@ matrix_synapse_ext_encryption_config_yaml: |
 # Enabling this will enable customizations and inject the appropriate Dockerfile clauses for installing synapse-s3-storage-provider.
 matrix_synapse_ext_synapse_s3_storage_provider_enabled: false
 # renovate: datasource=github-releases depName=matrix-org/synapse-s3-storage-provider
-matrix_synapse_ext_synapse_s3_storage_provider_version: 1.5.0
+matrix_synapse_ext_synapse_s3_storage_provider_version: 1.6.0
 # Controls whether media from this (local) server is stored in s3-storage-provider
 matrix_synapse_ext_synapse_s3_storage_provider_store_local: true
 # Controls whether media from remote servers is stored in s3-storage-provider

roles/custom/matrix-synapse/tasks/validate_config.yml

@@ -117,6 +117,8 @@
     - {'old': 'matrix_synapse_experimental_features_msc3861_admin_token', 'new': '<removed>'}
     - {'old': 'matrix_synapse_experimental_features_msc3861_account_management_url', 'new': '<removed>'}
 
+    - {'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>'}
+
 - name: (Deprecation) Catch and report renamed settings in matrix_synapse_configuration_extension_yaml
   ansible.builtin.fail:
     msg: >-

roles/custom/matrix-synapse/templates/synapse/customizations/Dockerfile.j2

@@ -45,12 +45,8 @@ RUN pip install synapse-auto-accept-invite=={{ matrix_synapse_ext_synapse_auto_a
 {% endif %}
 
 {% if matrix_synapse_container_image_customizations_s3_storage_provider_installation_enabled %}
-{% if matrix_synapse_container_image_customizations_s3_storage_provider_installation_old_boto_workaround_enabled %}
-RUN pip install 'boto3<1.36.0' 'botocore<1.36.0' synapse-s3-storage-provider=={{ matrix_synapse_ext_synapse_s3_storage_provider_version }}
-{% else %}
 RUN pip install synapse-s3-storage-provider=={{ matrix_synapse_ext_synapse_s3_storage_provider_version }}
 {% endif %}
-{% endif %}
 
 {% if matrix_synapse_container_image_customizations_templates_enabled %}
 COPY --from=templates-builder {{ matrix_synapse_container_image_customizations_templates_in_container_base_path }} {{ matrix_synapse_container_image_customizations_templates_in_container_base_path }}