Просмотр исходного кода

Use base64 encoded string for sse-c key

pull/2220/head
Cody Wyatt Neiman 3 лет назад
Родитель
Сommit
4d44f7b49e
Не найден GPG ключ соответствующий данной подписи Идентификатор GPG ключа: 94475C8B94E4698D
2 измененных файлов: 2 добавлений и 2 удалений
  1. +1
    -1
      roles/custom/matrix-synapse/templates/synapse/ext/s3-storage-provider/env.j2
  2. +1
    -1
      roles/custom/matrix-synapse/templates/synapse/ext/s3-storage-provider/media_storage_provider.yaml.j2

+ 1
- 1
roles/custom/matrix-synapse/templates/synapse/ext/s3-storage-provider/env.j2 Просмотреть файл

@@ -6,7 +6,7 @@ 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_sse_customer_enabled %}
SSE_CUSTOMER_KEY={{ matrix_synapse_ext_synapse_s3_storage_provider_config_sse_customer_key }}
SSE_CUSTOMER_KEY={{ matrix_synapse_ext_synapse_s3_storage_provider_config_sse_customer_key | b64decode }}
SSE_CUSTOMER_ALGO={{ matrix_synapse_ext_synapse_s3_storage_provider_config_sse_customer_algo }}
{% endif %}



+ 1
- 1
roles/custom/matrix-synapse/templates/synapse/ext/s3-storage-provider/media_storage_provider.yaml.j2 Просмотреть файл

@@ -10,7 +10,7 @@ config:
secret_access_key: {{ matrix_synapse_ext_synapse_s3_storage_provider_config_secret_access_key | to_json }}

{% 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 | to_json }}
sse_customer_key: {{ matrix_synapse_ext_synapse_s3_storage_provider_config_sse_customer_key | b64decode | to_json }}
sse_customer_algo: {{ matrix_synapse_ext_synapse_s3_storage_provider_config_sse_customer_algo | to_json }}

{% endif %}


Загрузка…
Отмена
Сохранить