From 718940118553b47c02d42f1691973cfdac550179 Mon Sep 17 00:00:00 2001 From: Markus <48181660+BackInBash@users.noreply.github.com> Date: Thu, 21 Apr 2022 11:52:46 +0200 Subject: [PATCH] Updated Config --- roles/matrix-synapse/defaults/main.yml | 22 ++++++++----------- .../tasks/synapse/setup_install.yml | 3 +++ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/roles/matrix-synapse/defaults/main.yml b/roles/matrix-synapse/defaults/main.yml index 9e97e6865..b6926b868 100644 --- a/roles/matrix-synapse/defaults/main.yml +++ b/roles/matrix-synapse/defaults/main.yml @@ -597,19 +597,15 @@ matrix_synapse_media_storage_provider_s3_threadpool_size: "20" matrix_synapse_media_storage_provider_s3_config: "{{ matrix_synapse_media_storage_provider_s3_config_yaml|from_yaml }}" matrix_synapse_media_storage_provider_s3_config_yaml: | - store_local: {{ matrix_synapse_s3_media_store_on_s3 }} - store_remote: {{ matrix_synapse_s3_media_store_on_local_filesystem }} - store_synchronous: {{ matrix_synapse_media_storage_provider_s3_store_synchronous }} - config: - bucket: {{ matrix_synapse_media_storage_provider_s3_bucket|to_json }} - # All of the below options are optional, for use with non-AWS S3-like - # services, or to specify access tokens here instead of some external method. - region_name: {{ matrix_synapse_media_storage_provider_s3_region_name|to_json }} - endpoint_url: {{ matrix_synapse_media_storage_provider_s3_endpoint_url|to_json }} - access_key_id: {{ matrix_synapse_media_storage_provider_s3_access_key_id|to_json }} - secret_access_key: {{ matrix_synapse_media_storage_provider_s3_secret_access_key|to_json }} - storage_class: {{ matrix_synapse_s3_media_store_storage_class|to_json }} - threadpool_size: {{ matrix_synapse_media_storage_provider_s3_threadpool_size }} + bucket: {{ matrix_synapse_media_storage_provider_s3_bucket|to_json }} + # All of the below options are optional, for use with non-AWS S3-like + # services, or to specify access tokens here instead of some external method. + region_name: {{ matrix_synapse_media_storage_provider_s3_region_name|to_json }} + endpoint_url: {{ matrix_synapse_media_storage_provider_s3_endpoint_url|to_json }} + access_key_id: {{ matrix_synapse_media_storage_provider_s3_access_key_id|to_json }} + secret_access_key: {{ matrix_synapse_media_storage_provider_s3_secret_access_key|to_json }} + storage_class: {{ matrix_synapse_s3_media_store_storage_class|to_json }} + threadpool_size: {{ matrix_synapse_media_storage_provider_s3_threadpool_size }} # Goofys S3 Integration matrix_s3_media_store_enabled: false diff --git a/roles/matrix-synapse/tasks/synapse/setup_install.yml b/roles/matrix-synapse/tasks/synapse/setup_install.yml index 8b3b9f02f..1dbbde9a7 100644 --- a/roles/matrix-synapse/tasks/synapse/setup_install.yml +++ b/roles/matrix-synapse/tasks/synapse/setup_install.yml @@ -137,6 +137,9 @@ [ { "module": "s3_storage_provider.S3StorageProviderBackend", + "store_local": matrix_synapse_s3_media_store_on_s3 + "store_remote": matrix_synapse_s3_media_store_on_local_filesystem + "store_synchronous": matrix_synapse_media_storage_provider_s3_store_synchronous "config": "matrix_synapse_media_storage_provider_s3_config" } ]