From 3e5d5451ad26ed5a158893276ebc9ff002f5a95d Mon Sep 17 00:00:00 2001 From: Junxiang Huang Date: Mon, 11 Nov 2024 10:14:31 +0800 Subject: [PATCH] update 12.0 s3 init --- manual/config/env.md | 3 +++ manual/docker/cluster/env | 3 +++ manual/docker/cluster/seafile-server.yml | 4 ++++ manual/docker/pro/env | 3 +++ manual/docker/pro/seafile-server.yml | 3 +++ manual/setup/setup_pro_by_docker.md | 3 +++ 6 files changed, 19 insertions(+) diff --git a/manual/config/env.md b/manual/config/env.md index 7d19c5250..681ed2744 100644 --- a/manual/config/env.md +++ b/manual/config/env.md @@ -115,3 +115,6 @@ SEADOC_SERVER_URL=http://example.seafile.com/sdoc-server - `INIT_S3_BLOCK_BUCKET`: S3 storage backend block objects bucket - `INIT_S3_KEY_ID`: S3 storage backend key ID - `INIT_S3_SECRET_KEY`: S3 storage backend secret key +- `INIT_S3_USE_V4_SIGNATURE`: Use the v4 protocol of S3 if enabled, default is `true` +- `INIT_S3_AWS_REGION`: Region you create the buckets, default is `us-east-1`. (Only valid when `INIT_S3_USE_V4_SIGNATURE` sets to `true`) +- `INIT_S3_USE_HTTPS`: Use HTTPS connections to S3 if enabled, default is `true` diff --git a/manual/docker/cluster/env b/manual/docker/cluster/env index ac1a4cee5..40e613837 100644 --- a/manual/docker/cluster/env +++ b/manual/docker/cluster/env @@ -29,3 +29,6 @@ INIT_S3_FS_BUCKET= INIT_S3_BLOCK_BUCKET= INIT_S3_KEY_ID= INIT_S3_SECRET_KEY= +INIT_S3_USE_V4_SIGNATURE=true +INIT_S3_AWS_REGION=us-east-1 +INIT_S3_USE_HTTPS=true diff --git a/manual/docker/cluster/seafile-server.yml b/manual/docker/cluster/seafile-server.yml index f909b29a9..a0dd2940f 100644 --- a/manual/docker/cluster/seafile-server.yml +++ b/manual/docker/cluster/seafile-server.yml @@ -24,3 +24,7 @@ services: - INIT_S3_BLOCK_BUCKET=${INIT_S3_BLOCK_BUCKET} - INIT_S3_KEY_ID=${INIT_S3_KEY_ID} - INIT_S3_SECRET_KEY=${INIT_S3_SECRET_KEY} + - INIT_S3_USE_V4_SIGNATURE=${INIT_S3_USE_V4_SIGNATURE:-true} + - INIT_S3_AWS_REGION=${INIT_S3_AWS_REGION:-us-east-1} + - INIT_S3_USE_HTTPS=${INIT_S3_USE_HTTPS:-true} + diff --git a/manual/docker/pro/env b/manual/docker/pro/env index 8715d5a40..2e5e8e349 100644 --- a/manual/docker/pro/env +++ b/manual/docker/pro/env @@ -33,6 +33,9 @@ INIT_S3_FS_BUCKET= INIT_S3_BLOCK_BUCKET= INIT_S3_KEY_ID= INIT_S3_SECRET_KEY= +INIT_S3_USE_V4_SIGNATURE=true +INIT_S3_AWS_REGION=us-east-1 +INIT_S3_USE_HTTPS=true SEADOC_IMAGE=seafileltd/sdoc-server:1.0-latest diff --git a/manual/docker/pro/seafile-server.yml b/manual/docker/pro/seafile-server.yml index e4fae0fb1..038703145 100644 --- a/manual/docker/pro/seafile-server.yml +++ b/manual/docker/pro/seafile-server.yml @@ -64,6 +64,9 @@ services: - INIT_S3_BLOCK_BUCKET=${INIT_S3_BLOCK_BUCKET} - INIT_S3_KEY_ID=${INIT_S3_KEY_ID} - INIT_S3_SECRET_KEY=${INIT_S3_SECRET_KEY} + - INIT_S3_USE_V4_SIGNATURE=${INIT_S3_USE_V4_SIGNATURE:-true} + - INIT_S3_AWS_REGION=${INIT_S3_AWS_REGION:-us-east-1} + - INIT_S3_USE_HTTPS=${INIT_S3_USE_HTTPS:-true} labels: caddy: ${SEAFILE_SERVER_PROTOCOL:-http}://${SEAFILE_SERVER_HOSTNAME:?Variable is not set or empty} caddy.reverse_proxy: "{{upstreams 80}}" diff --git a/manual/setup/setup_pro_by_docker.md b/manual/setup/setup_pro_by_docker.md index 8065cb72a..d5eb11c05 100644 --- a/manual/setup/setup_pro_by_docker.md +++ b/manual/setup/setup_pro_by_docker.md @@ -90,6 +90,9 @@ The following fields merit particular attention: | `INIT_S3_BLOCK_BUCKET` | S3 storage backend block objects bucket (only valid when `INIT_S3_STORAGE_BACKEND_CONFIG` sets to `true`) | (required when `INIT_S3_STORAGE_BACKEND_CONFIG` sets to `true`) | | `INIT_S3_KEY_ID` | S3 storage backend key ID (only valid when `INIT_S3_STORAGE_BACKEND_CONFIG` sets to `true`) | (required when `INIT_S3_STORAGE_BACKEND_CONFIG` sets to `true`) | | `INIT_S3_SECRET_KEY` | S3 storage backend secret key (only valid when `INIT_S3_STORAGE_BACKEND_CONFIG` sets to `true`) | (required when `INIT_S3_STORAGE_BACKEND_CONFIG` sets to `true`) | +| `INIT_S3_USE_V4_SIGNATURE` | Use the v4 protocol of S3 if enabled (only valid when `INIT_S3_STORAGE_BACKEND_CONFIG` sets to `true`) | `true` | +| `INIT_S3_AWS_REGION` | Region you create the buckets (only valid when `INIT_S3_STORAGE_BACKEND_CONFIG` and `INIT_S3_USE_V4_SIGNATURE` sets to `true`) | `us-east-1` | +| `INIT_S3_USE_HTTPS` | Use HTTPS connections to S3 if enabled (only valid when `INIT_S3_STORAGE_BACKEND_CONFIG` sets to `true`) | `true` | To conclude, set the directory permissions of the Elasticsearch volumne: