diff --git a/manual/config/env.md b/manual/config/env.md index f45dc718..d9777ac3 100644 --- a/manual/config/env.md +++ b/manual/config/env.md @@ -126,7 +126,7 @@ NOTIFICATION_SERVER_VOLUME=/opt/notification-data - `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 of your buckets (AWS only), default is `us-east-1`. (Only valid when `INIT_S3_USE_V4_SIGNATURE` sets to `true`) -- `INIT_S3_HOST`: Host of your buckets, default is `s3.us-east-1.amazonaws.com`. (Only valid when `INIT_S3_USE_V4_SIGNATURE` sets to `true`) +- `INIT_S3_HOST`: Host of your buckets (Only required when not use AWS). - `INIT_S3_USE_HTTPS`: Use HTTPS connections to S3 if enabled, default is `true` ## SeaSearch diff --git a/manual/repo/docker/cluster/env b/manual/repo/docker/cluster/env index 7b828476..afd6cac5 100644 --- a/manual/repo/docker/cluster/env +++ b/manual/repo/docker/cluster/env @@ -35,7 +35,7 @@ INIT_S3_KEY_ID= INIT_S3_SECRET_KEY= INIT_S3_USE_V4_SIGNATURE=true INIT_S3_AWS_REGION=us-east-1 -INIT_S3_HOST=s3.us-east-1.amazonaws.com +INIT_S3_HOST= INIT_S3_USE_HTTPS=true JWT_PRIVATE_KEY= \ No newline at end of file diff --git a/manual/repo/docker/cluster/seafile-server.yml b/manual/repo/docker/cluster/seafile-server.yml index 47cd4c61..cd1ad1f4 100644 --- a/manual/repo/docker/cluster/seafile-server.yml +++ b/manual/repo/docker/cluster/seafile-server.yml @@ -34,7 +34,7 @@ services: - 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_HOST=${INIT_S3_HOST:-s3.us-east-1.amazonaws.com} + - INIT_S3_HOST=${INIT_S3_HOST:-} - INIT_S3_USE_HTTPS=${INIT_S3_USE_HTTPS:-true} - JWT_PRIVATE_KEY=${JWT_PRIVATE_KEY:?Variable is not set or empty} - SEAFILE_LOG_TO_STDOUT=${SEAFILE_LOG_TO_STDOUT:-false} diff --git a/manual/repo/docker/pro/env b/manual/repo/docker/pro/env index 3f9b9b08..9468fcc6 100644 --- a/manual/repo/docker/pro/env +++ b/manual/repo/docker/pro/env @@ -47,7 +47,7 @@ INIT_S3_KEY_ID= INIT_S3_SECRET_KEY= INIT_S3_USE_V4_SIGNATURE=true INIT_S3_AWS_REGION=us-east-1 -INIT_S3_HOST=s3.us-east-1.amazonaws.com +INIT_S3_HOST= INIT_S3_USE_HTTPS=true # SeaDoc service @@ -76,7 +76,7 @@ SS_MAX_OBJ_CACHE_SIZE=10GB SS_S3_USE_V4_SIGNATURE=false SS_S3_ACCESS_ID= SS_S3_ACCESS_SECRET= -SS_S3_ENDPOINT=s3.us-east-1.amazonaws.com +SS_S3_ENDPOINT= SS_S3_BUCKET= SS_S3_USE_HTTPS=true SS_S3_PATH_STYLE_REQUEST=true diff --git a/manual/repo/docker/pro/seafile-server.yml b/manual/repo/docker/pro/seafile-server.yml index c7013ee3..19aa9666 100644 --- a/manual/repo/docker/pro/seafile-server.yml +++ b/manual/repo/docker/pro/seafile-server.yml @@ -84,7 +84,7 @@ services: - 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_HOST=${INIT_S3_HOST:-us-east-1} + - INIT_S3_HOST=${INIT_S3_HOST:-} - INIT_S3_USE_HTTPS=${INIT_S3_USE_HTTPS:-true} labels: caddy: ${SEAFILE_SERVER_PROTOCOL:-http}://${SEAFILE_SERVER_HOSTNAME:?Variable is not set or empty} diff --git a/manual/repo/docker/pro/seasearch.yml b/manual/repo/docker/pro/seasearch.yml index 84aea0ff..da578933 100644 --- a/manual/repo/docker/pro/seasearch.yml +++ b/manual/repo/docker/pro/seasearch.yml @@ -12,7 +12,7 @@ services: - SS_S3_ACCESS_ID=${SS_S3_ACCESS_ID:-} - SS_S3_USE_V4_SIGNATURE=${SS_S3_USE_V4_SIGNATURE:-false} - SS_S3_ACCESS_SECRET=${SS_S3_ACCESS_SECRET:-} - - SS_S3_ENDPOINT=${SS_S3_ENDPOINT:-s3.us-east-1.amazonaws.com`} + - SS_S3_ENDPOINT=${SS_S3_ENDPOINT:-} - SS_S3_BUCKET=${SS_S3_BUCKET:-} - SS_S3_USE_HTTPS=${SS_S3_USE_HTTPS:-true} - SS_S3_PATH_STYLE_REQUEST=${SS_S3_PATH_STYLE_REQUEST:-true} diff --git a/manual/repo/k8s/cluster/seafile-env.yaml b/manual/repo/k8s/cluster/seafile-env.yaml index f6d94231..f1c5be6f 100644 --- a/manual/repo/k8s/cluster/seafile-env.yaml +++ b/manual/repo/k8s/cluster/seafile-env.yaml @@ -39,5 +39,5 @@ data: INIT_S3_KEY_ID: "" INIT_S3_USE_V4_SIGNATURE: "true" INIT_S3_AWS_REGION: "us-east-1" - INIT_S3_HOST: "s3.us-east-1.amazonaws.com" + INIT_S3_HOST: "" INIT_S3_USE_HTTPS: "true" diff --git a/manual/repo/k8s/pro/seafile-env.yaml b/manual/repo/k8s/pro/seafile-env.yaml index df081aed..9cf8644b 100644 --- a/manual/repo/k8s/pro/seafile-env.yaml +++ b/manual/repo/k8s/pro/seafile-env.yaml @@ -33,5 +33,5 @@ data: INIT_S3_KEY_ID: "" INIT_S3_USE_V4_SIGNATURE: "true" INIT_S3_AWS_REGION: "us-east-1" - INIT_S3_HOST: "s3.us-east-1.amazonaws.com" + INIT_S3_HOST: "" INIT_S3_USE_HTTPS: "true" diff --git a/manual/setup/setup_pro_by_docker.md b/manual/setup/setup_pro_by_docker.md index a2c6ef90..e7ef0f2c 100644 --- a/manual/setup/setup_pro_by_docker.md +++ b/manual/setup/setup_pro_by_docker.md @@ -75,7 +75,7 @@ The following fields merit particular attention: | `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 of your buckets (only valid when `INIT_S3_STORAGE_BACKEND_CONFIG` and `INIT_S3_USE_V4_SIGNATURE` sets to `true`) | `us-east-1` | -| `INIT_S3_HOST` | Host of your buckets (only valid when `INIT_S3_STORAGE_BACKEND_CONFIG` and `INIT_S3_USE_V4_SIGNATURE` sets to `true`) | `s3.us-east-1.amazonaws.com` | +| `INIT_S3_HOST` | Host of your buckets (only valid when `INIT_S3_STORAGE_BACKEND_CONFIG` and `INIT_S3_USE_V4_SIGNATURE` sets to `true`) | (required when not use AWS) | | `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: diff --git a/manual/setup/setup_with_s3.md b/manual/setup/setup_with_s3.md index 7f78cc87..c7400f35 100644 --- a/manual/setup/setup_with_s3.md +++ b/manual/setup/setup_with_s3.md @@ -29,7 +29,7 @@ INIT_S3_SECRET_KEY= INIT_S3_USE_V4_SIGNATURE=true INIT_S3_AWS_REGION=us-east-1 # your AWS Region - INIT_S3_HOST=s3.us-east-1.amazonaws.com # your S3 Host + INIT_S3_HOST= # your S3 Host INIT_S3_USE_HTTPS=true ``` diff --git a/manual/setup/use_other_reverse_proxy.md b/manual/setup/use_other_reverse_proxy.md index 54268764..201a26a8 100644 --- a/manual/setup/use_other_reverse_proxy.md +++ b/manual/setup/use_other_reverse_proxy.md @@ -78,7 +78,7 @@ services: - 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_HOST=${INIT_S3_HOST:-us-east-1} + - INIT_S3_HOST=${INIT_S3_HOST:-} - INIT_S3_USE_HTTPS=${INIT_S3_USE_HTTPS:-true} # please remove the label section depends_on: