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

add matrix_synapse_ext_s3_storage_provider_container_arguments var

pull/4827/head
Aine 2 месяцев назад
Родитель
Сommit
484e94d493
Не найден GPG ключ соответствующий данной подписи Идентификатор GPG ключа: 34969C908CCA2804
2 измененных файлов: 5 добавлений и 0 удалений
  1. +2
    -0
      roles/custom/matrix-synapse/defaults/main.yml
  2. +3
    -0
      roles/custom/matrix-synapse/templates/synapse/ext/s3-storage-provider/bin/migrate.j2

+ 2
- 0
roles/custom/matrix-synapse/defaults/main.yml Просмотреть файл

@@ -128,6 +128,8 @@ matrix_synapse_ext_path: "{{ matrix_synapse_base_path }}/ext"
matrix_synapse_ext_s3_storage_provider_base_path: "{{ matrix_synapse_base_path }}/ext/s3-storage-provider"
matrix_synapse_ext_s3_storage_provider_bin_path: "{{ matrix_synapse_ext_s3_storage_provider_base_path }}/bin"
matrix_synapse_ext_s3_storage_provider_data_path: "{{ matrix_synapse_ext_s3_storage_provider_base_path }}/data"
# extra arguments to pass to s3-storage-provider script when starting Synapse container
matrix_synapse_ext_s3_storage_provider_container_arguments: []

matrix_synapse_container_client_api_port: 8008



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

@@ -11,6 +11,9 @@ container_id=$(\
--workdir=/data \
--network={{ matrix_synapse_container_network }} \
--entrypoint=/bin/bash \
{% for arg in matrix_synapse_ext_s3_storage_provider_container_arguments %}
{{ arg }} \
{% endfor %}
{{ matrix_synapse_docker_image_final }} \
-c 's3_media_upload update-db $UPDATE_DB_DURATION && s3_media_upload --no-progress check-deleted $MEDIA_PATH && s3_media_upload --no-progress upload $MEDIA_PATH $BUCKET --delete --storage-class $STORAGE_CLASS --endpoint-url $ENDPOINT {% if matrix_synapse_ext_synapse_s3_storage_provider_config_sse_customer_enabled %}--sse-customer-algo $SSE_CUSTOMER_ALGO --sse-customer-key $SSE_CUSTOMER_KEY{% endif %}' \
)


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