summaryrefslogtreecommitdiff
path: root/src/services
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2021-02-06 11:48:57 +0900
committerGitHub <noreply@github.com>2021-02-06 11:48:57 +0900
commitc88902e640e6ac7f7c9ea4b66f8a6005273636ab (patch)
tree9c9db6aa532143d8629fba826c8de18f5ccc54fd /src/services
parentImprove captcha (#7138) (diff)
downloadmisskey-c88902e640e6ac7f7c9ea4b66f8a6005273636ab.tar.gz
misskey-c88902e640e6ac7f7c9ea4b66f8a6005273636ab.tar.bz2
misskey-c88902e640e6ac7f7c9ea4b66f8a6005273636ab.zip
s3ForcePathStyle (#7122)
Co-authored-by: ybw2016v <dogcraft@126.com>
Diffstat (limited to 'src/services')
-rw-r--r--src/services/drive/s3.ts4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/services/drive/s3.ts b/src/services/drive/s3.ts
index abe3c166a5..f419f09377 100644
--- a/src/services/drive/s3.ts
+++ b/src/services/drive/s3.ts
@@ -13,7 +13,9 @@ export function getS3(meta: Meta) {
secretAccessKey: meta.objectStorageSecretKey!,
region: meta.objectStorageRegion || undefined,
sslEnabled: meta.objectStorageUseSSL,
- s3ForcePathStyle: !!meta.objectStorageEndpoint,
+ s3ForcePathStyle: !meta.objectStorageEndpoint // AWS with endPoint omitted
+ ? false
+ : meta.objectStorageS3ForcePathStyle,
httpOptions: {
agent: getAgentByUrl(new URL(u), !meta.objectStorageUseProxy)
}