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

Encode s3 sse-c key for utf-8

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

+ 1
- 1
docs/configuring-playbook-synapse-s3-storage-provider.md Просмотреть файл

@@ -43,7 +43,7 @@ matrix_synapse_ext_synapse_s3_storage_provider_config_storage_class: STANDARD #
# This is not recommended unless you understand what you are doing, and may make restoring from backups additionally challenging
# You can read more about SSE-C here: https://docs.aws.amazon.com/AmazonS3/latest/userguide/ServerSideEncryptionCustomerKeys.html
matrix_synapse_ext_synapse_s3_storage_provider_config_sse_customer_enabled: true
matrix_synapse_ext_synapse_s3_storage_provider_config_sse_customer_key: ssec-key-goes-here # Generate with: cat /dev/urandom | head -c 32 | base64 -
matrix_synapse_ext_synapse_s3_storage_provider_config_sse_customer_key: ssec-key-goes-here # Generate with: cat /dev/urandom | base64 | head -c 32
matrix_synapse_ext_synapse_s3_storage_provider_config_sse_customer_algo: AES256
# Using the git version is also required until > v1.1.2 is released
matrix_synapse_ext_synapse_s3_storage_provider_version: git


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

{% endif %}


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