Skip to content

Commit

Permalink
Upgrade synapse-s3-storage-provider (1.3.0 -> 1.5.0) and adapt config…
Browse files Browse the repository at this point in the history
…uration

1.3.0 fails to work against the new Synapse (v1.115.0) image.
See: matrix-org/synapse-s3-storage-provider#114

Related to: #3535
  • Loading branch information
spantaleev committed Sep 17, 2024
1 parent bc0d475 commit cf57639
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
6 changes: 5 additions & 1 deletion roles/custom/matrix-synapse/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1231,7 +1231,7 @@ matrix_synapse_ext_encryption_config_yaml: |
# 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-s3-storage-provider.
matrix_synapse_ext_synapse_s3_storage_provider_enabled: false
matrix_synapse_ext_synapse_s3_storage_provider_version: 1.3.0
matrix_synapse_ext_synapse_s3_storage_provider_version: 1.5.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
Expand All @@ -1242,6 +1242,10 @@ matrix_synapse_ext_synapse_s3_storage_provider_store_remote: true
# because the local filesystem is a reliable data store anyway.
matrix_synapse_ext_synapse_s3_storage_provider_store_synchronous: false
matrix_synapse_ext_synapse_s3_storage_provider_config_bucket: ''
# Prefix for all media in bucket, can't be changed once media has been uploaded.
# Useful if sharing the bucket between Synapses
# Example value: prefix/to/files/in/bucket
matrix_synapse_ext_synapse_s3_storage_provider_config_prefix: ''
matrix_synapse_ext_synapse_s3_storage_provider_config_region_name: ''
matrix_synapse_ext_synapse_s3_storage_provider_config_endpoint_url: ''
matrix_synapse_ext_synapse_s3_storage_provider_config_access_key_id: ''
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ AWS_DEFAULT_REGION={{ matrix_synapse_ext_synapse_s3_storage_provider_config_regi
ENDPOINT={{ matrix_synapse_ext_synapse_s3_storage_provider_config_endpoint_url }}
BUCKET={{ matrix_synapse_ext_synapse_s3_storage_provider_config_bucket }}

{% if matrix_synapse_ext_synapse_s3_storage_provider_config_prefix %}
PREFIX={{ matrix_synapse_ext_synapse_s3_storage_provider_config_prefix }}
{% endif %}

{% if matrix_synapse_ext_synapse_s3_storage_provider_config_sse_customer_enabled %}
SSE_CUSTOMER_KEY={{ matrix_synapse_ext_synapse_s3_storage_provider_config_sse_customer_key }}
SSE_CUSTOMER_ALGO={{ matrix_synapse_ext_synapse_s3_storage_provider_config_sse_customer_algo }}
Expand Down

0 comments on commit cf57639

Please sign in to comment.