From 5b5b8002ea5c52f7f812afd93c68e9235b6923c7 Mon Sep 17 00:00:00 2001
From: Markus <48181660+BackInBash@users.noreply.github.com>
Date: Thu, 21 Apr 2022 11:10:41 +0200
Subject: [PATCH] Media Option renaming

---
 roles/matrix-synapse/defaults/main.yml                    | 6 +++---
 roles/matrix-synapse/templates/synapse/homeserver.yaml.j2 | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/roles/matrix-synapse/defaults/main.yml b/roles/matrix-synapse/defaults/main.yml
index f511472d4..99391c7d4 100644
--- a/roles/matrix-synapse/defaults/main.yml
+++ b/roles/matrix-synapse/defaults/main.yml
@@ -580,10 +580,10 @@ matrix_synapse_ext_encryption_config_yaml: |
 # So with setting matrix_synapse_media_storage_provider_s3_enabled to true the matrix_synapse_container_image_self_build is overwritten.
 # All configuration options are avaliable here: https://github.com/matrix-org/synapse-s3-storage-provider
 matrix_synapse_media_storage_provider_s3_enabled: false
+# Save media on remote S3 Bucket
+matrix_synapse_s3_media_store_on_s3: false
 # Save media on local media store
-matrix_synapse_media_storage_provider_s3_store_local: false
-# Save media on remote media store
-matrix_synapse_media_storage_provider_s3_store_remote: true
+matrix_synapse_s3_media_store_on_local_filesystem: true
 # Synchronous upload
 matrix_synapse_media_storage_provider_s3_store_synchronous: false
 
diff --git a/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2 b/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2
index d9cac3aee..82dd2d4e4 100644
--- a/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2
+++ b/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2
@@ -1044,9 +1044,9 @@ media_store_path: "/matrix-media-store-parent/{{ matrix_synapse_media_store_dire
 media_storage_providers:
 - module: s3_storage_provider.S3StorageProviderBackend
   # In the context of this module the local store means the S3 Bucket
-  # and the remote store the local volume ¯\_(ツ)_/¯ (i swaped it for convenience)
-  store_local: {{ matrix_synapse_media_storage_provider_s3_store_local }}
-  store_remote: {{ matrix_synapse_media_storage_provider_s3_store_remote }}
+  # and the remote store the local volume ¯\_(ツ)_/¯
+  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 }}