From d54ed35755efec4733a0ef0aeca35ce2e1d8911c Mon Sep 17 00:00:00 2001 From: BennyKok Date: Fri, 29 Dec 2023 16:02:42 +0800 Subject: [PATCH] chore(web): add process.env.SPACES_CDN_FORCE_PATH_STYLE --- web/src/server/replaceCDNUrl.ts | 7 ++++++- web/src/server/resource.ts | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/web/src/server/replaceCDNUrl.ts b/web/src/server/replaceCDNUrl.ts index 156538d..d719b71 100644 --- a/web/src/server/replaceCDNUrl.ts +++ b/web/src/server/replaceCDNUrl.ts @@ -1,4 +1,3 @@ - export function replaceCDNUrl(url: string) { // When using R2, we don't want to include the bucket name in the URL if (process.env.SPACES_CDN_DONT_INCLUDE_BUCKET === "true") { @@ -6,6 +5,12 @@ export function replaceCDNUrl(url: string) { `${process.env.SPACES_ENDPOINT}/${process.env.SPACES_BUCKET}`, process.env.SPACES_ENDPOINT_CDN! ); + // When using digital ocean, we need to use the bucket name in the URL + } else if (process.env.SPACES_CDN_FORCE_PATH_STYLE === "false") { + url = url.replace( + `${process.env.SPACES_ENDPOINT}/${process.env.SPACES_BUCKET}`, + `${process.env.SPACES_BUCKET}.${process.env.SPACES_ENDPOINT_CDN}}` + ); } else { url = url.replace( process.env.SPACES_ENDPOINT!, diff --git a/web/src/server/resource.ts b/web/src/server/resource.ts index c1ab01b..93f4448 100644 --- a/web/src/server/resource.ts +++ b/web/src/server/resource.ts @@ -15,7 +15,7 @@ const s3Client = new S3({ accessKeyId: process.env.SPACES_KEY!, secretAccessKey: process.env.SPACES_SECRET!, }, - forcePathStyle: true, + forcePathStyle: process.env.SPACES_CDN_FORCE_PATH_STYLE === "true", }); export type ResourceObject = {