Quellcode durchsuchen

Updated Config

pull/1769/head
Markus vor 3 Jahren
Ursprung
Commit
7189401185
2 geänderte Dateien mit 12 neuen und 13 gelöschten Zeilen
  1. +9
    -13
      roles/matrix-synapse/defaults/main.yml
  2. +3
    -0
      roles/matrix-synapse/tasks/synapse/setup_install.yml

+ 9
- 13
roles/matrix-synapse/defaults/main.yml Datei anzeigen

@@ -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: "{{ matrix_synapse_media_storage_provider_s3_config_yaml|from_yaml }}"
matrix_synapse_media_storage_provider_s3_config_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 # Goofys S3 Integration
matrix_s3_media_store_enabled: false matrix_s3_media_store_enabled: false


+ 3
- 0
roles/matrix-synapse/tasks/synapse/setup_install.yml Datei anzeigen

@@ -137,6 +137,9 @@
[ [
{ {
"module": "s3_storage_provider.S3StorageProviderBackend", "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" "config": "matrix_synapse_media_storage_provider_s3_config"
} }
] ]


Laden…
Abbrechen
Speichern