Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@

### Region

一般留空即可
请根据服务商实际情况填写;不填写时默认为 `us-east-1`

> 若确认过其他配置正确又不能访问,请在服务商的文档中查看并填写英文的 Region,例如 `cn-east-1`。
> 若不明确服务商区域,可以尝试填写 `us-east-1` 或 `auto`。
>
> Cloudflare 需要填写均为小写字母的 `auto`。
> Cloudflare R2、Tigris 等服务商通常需要填写均为小写字母的 `auto`。

### 上传目录

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/run/halo/s3os/S3OsProperties.java
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public class S3OsProperties {
private String domain;


private String region = "Auto";
private String region = "us-east-1";

/**
* Custom User-Agent header for S3 requests, optional.
Expand Down Expand Up @@ -118,7 +118,7 @@ public void setRandomStringLength(String randomStringLength) { // if you use In

public void setRegion(String region) {
if (!StringUtils.hasText(region)) {
this.region = "Auto";
this.region = "us-east-1";
} else {
this.region = region;
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/extensions/policy-template-s3os.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ spec:
- $formkit: text
name: region
label: Region
placeholder: 如不填写,则默认为 Auto
help: 若 Region 为 Auto 无法使用,才需要填写对应 Region,Cloudflare R2 需要填写均为小写字母的 auto
placeholder: 如不填写,则默认为 us-east-1
help: 请根据服务商实际情况填写。若不明确服务商区域,可以尝试填写 us-east-1 或 auto;不填写时默认为 us-east-1
- $formkit: text
name: userAgent
label: 自定义 User-Agent
Expand Down