diff --git a/.deploy/api/Dockerfile b/.deploy/api/Dockerfile index b38ffdd8bf0..a26315fca8e 100644 --- a/.deploy/api/Dockerfile +++ b/.deploy/api/Dockerfile @@ -32,6 +32,14 @@ ARG WASABI_SECRET_ACCESS_KEY ARG WASABI_REGION ARG WASABI_SERVICE_URL ARG WASABI_S3_BUCKET +ARG WASABI_S3_FORCE_PATH_STYLE +ARG DIGITALOCEAN_ACCESS_KEY_ID +ARG DIGITALOCEAN_SECRET_ACCESS_KEY +ARG DIGITALOCEAN_REGION +ARG DIGITALOCEAN_SERVICE_URL +ARG DIGITALOCEAN_CDN_URL +ARG DIGITALOCEAN_S3_BUCKET +ARG DIGITALOCEAN_S3_FORCE_PATH_STYLE ARG EXPRESS_SESSION_SECRET ARG JWT_SECRET ARG JWT_REFRESH_TOKEN_SECRET @@ -321,6 +329,14 @@ ENV WASABI_SECRET_ACCESS_KEY=${WASABI_SECRET_ACCESS_KEY} ENV WASABI_REGION=${WASABI_REGION} ENV WASABI_SERVICE_URL=${WASABI_SERVICE_URL} ENV WASABI_S3_BUCKET=${WASABI_S3_BUCKET} +ENV WASABI_S3_FORCE_PATH_STYLE=${WASABI_S3_FORCE_PATH_STYLE} +ENV DIGITALOCEAN_ACCESS_KEY_ID=${DIGITALOCEAN_ACCESS_KEY_ID} +ENV DIGITALOCEAN_SECRET_ACCESS_KEY=${DIGITALOCEAN_SECRET_ACCESS_KEY} +ENV DIGITALOCEAN_REGION=${DIGITALOCEAN_REGION} +ENV DIGITALOCEAN_SERVICE_URL=${DIGITALOCEAN_SERVICE_URL} +ENV DIGITALOCEAN_CDN_URL=${DIGITALOCEAN_CDN_URL} +ENV DIGITALOCEAN_S3_BUCKET=${DIGITALOCEAN_S3_BUCKET} +ENV DIGITALOCEAN_S3_FORCE_PATH_STYLE=${DIGITALOCEAN_S3_FORCE_PATH_STYLE:-false} ENV EXPRESS_SESSION_SECRET=${EXPRESS_SESSION_SECRET:-gauzy} ENV JWT_SECRET=${JWT_SECRET:-secretKey} ENV JWT_REFRESH_TOKEN_SECRET=${JWT_REFRESH_TOKEN_SECRET:-refreshSecretKey} diff --git a/.deploy/k8s/k8s-manifest.civo.prod.yaml b/.deploy/k8s/k8s-manifest.civo.prod.yaml index cff7dad7b5c..3de9bf13f23 100644 --- a/.deploy/k8s/k8s-manifest.civo.prod.yaml +++ b/.deploy/k8s/k8s-manifest.civo.prod.yaml @@ -111,6 +111,22 @@ spec: value: '$WASABI_SERVICE_URL' - name: WASABI_S3_BUCKET value: '$WASABI_S3_BUCKET' + - name: WASABI_S3_FORCE_PATH_STYLE + value: '$WASABI_S3_FORCE_PATH_STYLE' + - name: DIGITALOCEAN_ACCESS_KEY_ID + value: '$DIGITALOCEAN_ACCESS_KEY_ID' + - name: DIGITALOCEAN_SECRET_ACCESS_KEY + value: '$DIGITALOCEAN_SECRET_ACCESS_KEY' + - name: DIGITALOCEAN_REGION + value: '$DIGITALOCEAN_REGION' + - name: DIGITALOCEAN_SERVICE_URL + value: '$DIGITALOCEAN_SERVICE_URL' + - name: DIGITALOCEAN_CDN_URL + value: '$DIGITALOCEAN_CDN_URL' + - name: DIGITALOCEAN_S3_BUCKET + value: '$DIGITALOCEAN_S3_BUCKET' + - name: DIGITALOCEAN_S3_FORCE_PATH_STYLE + value: '$DIGITALOCEAN_S3_FORCE_PATH_STYLE' - name: EXPRESS_SESSION_SECRET value: '$EXPRESS_SESSION_SECRET' - name: JWT_SECRET diff --git a/.deploy/k8s/k8s-manifest.civo.stage.yaml b/.deploy/k8s/k8s-manifest.civo.stage.yaml index cdf7ce5fc2b..f1eb7266ee9 100644 --- a/.deploy/k8s/k8s-manifest.civo.stage.yaml +++ b/.deploy/k8s/k8s-manifest.civo.stage.yaml @@ -111,6 +111,24 @@ spec: value: '$WASABI_SERVICE_URL' - name: WASABI_S3_BUCKET value: '$WASABI_S3_BUCKET' + - name: WASABI_S3_FORCE_PATH_STYLE + value: '$WASABI_S3_FORCE_PATH_STYLE' + - name: WASABI_S3_FORCE_PATH_STYLE + value: '$WASABI_S3_FORCE_PATH_STYLE' + - name: DIGITALOCEAN_ACCESS_KEY_ID + value: '$DIGITALOCEAN_ACCESS_KEY_ID' + - name: DIGITALOCEAN_SECRET_ACCESS_KEY + value: '$DIGITALOCEAN_SECRET_ACCESS_KEY' + - name: DIGITALOCEAN_REGION + value: '$DIGITALOCEAN_REGION' + - name: DIGITALOCEAN_SERVICE_URL + value: '$DIGITALOCEAN_SERVICE_URL' + - name: DIGITALOCEAN_CDN_URL + value: '$DIGITALOCEAN_CDN_URL' + - name: DIGITALOCEAN_S3_BUCKET + value: '$DIGITALOCEAN_S3_BUCKET' + - name: DIGITALOCEAN_S3_FORCE_PATH_STYLE + value: '$DIGITALOCEAN_S3_FORCE_PATH_STYLE' - name: EXPRESS_SESSION_SECRET value: '$EXPRESS_SESSION_SECRET' - name: JWT_SECRET diff --git a/.deploy/k8s/k8s-manifest.cw.prod.yaml b/.deploy/k8s/k8s-manifest.cw.prod.yaml index 5dbcdad00ec..714290d4b51 100644 --- a/.deploy/k8s/k8s-manifest.cw.prod.yaml +++ b/.deploy/k8s/k8s-manifest.cw.prod.yaml @@ -137,6 +137,22 @@ spec: value: '$WASABI_SERVICE_URL' - name: WASABI_S3_BUCKET value: '$WASABI_S3_BUCKET' + - name: WASABI_S3_FORCE_PATH_STYLE + value: '$WASABI_S3_FORCE_PATH_STYLE' + - name: DIGITALOCEAN_ACCESS_KEY_ID + value: '$DIGITALOCEAN_ACCESS_KEY_ID' + - name: DIGITALOCEAN_SECRET_ACCESS_KEY + value: '$DIGITALOCEAN_SECRET_ACCESS_KEY' + - name: DIGITALOCEAN_REGION + value: '$DIGITALOCEAN_REGION' + - name: DIGITALOCEAN_SERVICE_URL + value: '$DIGITALOCEAN_SERVICE_URL' + - name: DIGITALOCEAN_CDN_URL + value: '$DIGITALOCEAN_CDN_URL' + - name: DIGITALOCEAN_S3_BUCKET + value: '$DIGITALOCEAN_S3_BUCKET' + - name: DIGITALOCEAN_S3_FORCE_PATH_STYLE + value: '$DIGITALOCEAN_S3_FORCE_PATH_STYLE' - name: EXPRESS_SESSION_SECRET value: '$EXPRESS_SESSION_SECRET' - name: JWT_SECRET diff --git a/.deploy/k8s/k8s-manifest.cw.stage.yaml b/.deploy/k8s/k8s-manifest.cw.stage.yaml index 232b2249aa2..e0cd1e5933c 100644 --- a/.deploy/k8s/k8s-manifest.cw.stage.yaml +++ b/.deploy/k8s/k8s-manifest.cw.stage.yaml @@ -137,6 +137,22 @@ spec: value: '$WASABI_SERVICE_URL' - name: WASABI_S3_BUCKET value: '$WASABI_S3_BUCKET' + - name: WASABI_S3_FORCE_PATH_STYLE + value: '$WASABI_S3_FORCE_PATH_STYLE' + - name: DIGITALOCEAN_ACCESS_KEY_ID + value: '$DIGITALOCEAN_ACCESS_KEY_ID' + - name: DIGITALOCEAN_SECRET_ACCESS_KEY + value: '$DIGITALOCEAN_SECRET_ACCESS_KEY' + - name: DIGITALOCEAN_REGION + value: '$DIGITALOCEAN_REGION' + - name: DIGITALOCEAN_SERVICE_URL + value: '$DIGITALOCEAN_SERVICE_URL' + - name: DIGITALOCEAN_CDN_URL + value: '$DIGITALOCEAN_CDN_URL' + - name: DIGITALOCEAN_S3_BUCKET + value: '$DIGITALOCEAN_S3_BUCKET' + - name: DIGITALOCEAN_S3_FORCE_PATH_STYLE + value: '$DIGITALOCEAN_S3_FORCE_PATH_STYLE' - name: EXPRESS_SESSION_SECRET value: '$EXPRESS_SESSION_SECRET' - name: JWT_SECRET diff --git a/.deploy/k8s/k8s-manifest.prod.yaml b/.deploy/k8s/k8s-manifest.prod.yaml index 170c175cc60..d6881f6275e 100644 --- a/.deploy/k8s/k8s-manifest.prod.yaml +++ b/.deploy/k8s/k8s-manifest.prod.yaml @@ -135,6 +135,22 @@ spec: value: '$WASABI_SERVICE_URL' - name: WASABI_S3_BUCKET value: '$WASABI_S3_BUCKET' + - name: WASABI_S3_FORCE_PATH_STYLE + value: '$WASABI_S3_FORCE_PATH_STYLE' + - name: DIGITALOCEAN_ACCESS_KEY_ID + value: '$DIGITALOCEAN_ACCESS_KEY_ID' + - name: DIGITALOCEAN_SECRET_ACCESS_KEY + value: '$DIGITALOCEAN_SECRET_ACCESS_KEY' + - name: DIGITALOCEAN_REGION + value: '$DIGITALOCEAN_REGION' + - name: DIGITALOCEAN_SERVICE_URL + value: '$DIGITALOCEAN_SERVICE_URL' + - name: DIGITALOCEAN_CDN_URL + value: '$DIGITALOCEAN_CDN_URL' + - name: DIGITALOCEAN_S3_BUCKET + value: '$DIGITALOCEAN_S3_BUCKET' + - name: DIGITALOCEAN_S3_FORCE_PATH_STYLE + value: '$DIGITALOCEAN_S3_FORCE_PATH_STYLE' - name: EXPRESS_SESSION_SECRET value: '$EXPRESS_SESSION_SECRET' - name: JWT_SECRET diff --git a/.deploy/k8s/k8s-manifest.stage.yaml b/.deploy/k8s/k8s-manifest.stage.yaml index 19a88963415..7ab07a8f6a1 100644 --- a/.deploy/k8s/k8s-manifest.stage.yaml +++ b/.deploy/k8s/k8s-manifest.stage.yaml @@ -129,6 +129,22 @@ spec: value: '$WASABI_SERVICE_URL' - name: WASABI_S3_BUCKET value: '$WASABI_S3_BUCKET' + - name: WASABI_S3_FORCE_PATH_STYLE + value: '$WASABI_S3_FORCE_PATH_STYLE' + - name: DIGITALOCEAN_ACCESS_KEY_ID + value: '$DIGITALOCEAN_ACCESS_KEY_ID' + - name: DIGITALOCEAN_SECRET_ACCESS_KEY + value: '$DIGITALOCEAN_SECRET_ACCESS_KEY' + - name: DIGITALOCEAN_REGION + value: '$DIGITALOCEAN_REGION' + - name: DIGITALOCEAN_SERVICE_URL + value: '$DIGITALOCEAN_SERVICE_URL' + - name: DIGITALOCEAN_CDN_URL + value: '$DIGITALOCEAN_CDN_URL' + - name: DIGITALOCEAN_S3_BUCKET + value: '$DIGITALOCEAN_S3_BUCKET' + - name: DIGITALOCEAN_S3_FORCE_PATH_STYLE + value: '$DIGITALOCEAN_S3_FORCE_PATH_STYLE' - name: EXPRESS_SESSION_SECRET value: '$EXPRESS_SESSION_SECRET' - name: JWT_SECRET diff --git a/.deploy/ssh/with-cloudflare/demo/docker-compose.api.demo.template.yml b/.deploy/ssh/with-cloudflare/demo/docker-compose.api.demo.template.yml index be4de900105..cf2151ed4fb 100644 --- a/.deploy/ssh/with-cloudflare/demo/docker-compose.api.demo.template.yml +++ b/.deploy/ssh/with-cloudflare/demo/docker-compose.api.demo.template.yml @@ -42,6 +42,14 @@ services: WASABI_REGION: '${WASABI_REGION:-}' WASABI_SERVICE_URL: '${WASABI_SERVICE_URL:-}' WASABI_S3_BUCKET: '${WASABI_S3_BUCKET:-}' + WASABI_S3_FORCE_PATH_STYLE: '${WASABI_S3_FORCE_PATH_STYLE:-}' + DIGITALOCEAN_ACCESS_KEY_ID: '${DIGITALOCEAN_ACCESS_KEY_ID:-}' + DIGITALOCEAN_SECRET_ACCESS_KEY: '${DIGITALOCEAN_SECRET_ACCESS_KEY:-}' + DIGITALOCEAN_REGION: '${DIGITALOCEAN_REGION:-}' + DIGITALOCEAN_SERVICE_URL: '${DIGITALOCEAN_SERVICE_URL:-}' + DIGITALOCEAN_CDN_URL: '${DIGITALOCEAN_CDN_URL:-}' + DIGITALOCEAN_S3_BUCKET: '${DIGITALOCEAN_S3_BUCKET:-}' + DIGITALOCEAN_S3_FORCE_PATH_STYLE: '${DIGITALOCEAN_S3_FORCE_PATH_STYLE:-}' EXPRESS_SESSION_SECRET: '${EXPRESS_SESSION_SECRET:-}' JWT_SECRET: '${JWT_SECRET:-}' JWT_REFRESH_TOKEN_SECRET: '${JWT_REFRESH_TOKEN_SECRET:-}' diff --git a/.deploy/ssh/with-cloudflare/prod/docker-compose.api.prod.template.yml b/.deploy/ssh/with-cloudflare/prod/docker-compose.api.prod.template.yml index aa259b864c5..60e9fe4dfae 100644 --- a/.deploy/ssh/with-cloudflare/prod/docker-compose.api.prod.template.yml +++ b/.deploy/ssh/with-cloudflare/prod/docker-compose.api.prod.template.yml @@ -42,6 +42,14 @@ services: WASABI_REGION: '${WASABI_REGION}' WASABI_SERVICE_URL: '${WASABI_SERVICE_URL}' WASABI_S3_BUCKET: '${WASABI_S3_BUCKET}' + WASABI_S3_FORCE_PATH_STYLE: '${WASABI_S3_FORCE_PATH_STYLE:-}' + DIGITALOCEAN_ACCESS_KEY_ID: '${DIGITALOCEAN_ACCESS_KEY_ID:-}' + DIGITALOCEAN_SECRET_ACCESS_KEY: '${DIGITALOCEAN_SECRET_ACCESS_KEY:-}' + DIGITALOCEAN_REGION: '${DIGITALOCEAN_REGION:-}' + DIGITALOCEAN_SERVICE_URL: '${DIGITALOCEAN_SERVICE_URL:-}' + DIGITALOCEAN_CDN_URL: '${DIGITALOCEAN_CDN_URL:-}' + DIGITALOCEAN_S3_BUCKET: '${DIGITALOCEAN_S3_BUCKET:-}' + DIGITALOCEAN_S3_FORCE_PATH_STYLE: '${DIGITALOCEAN_S3_FORCE_PATH_STYLE:-}' EXPRESS_SESSION_SECRET: '${EXPRESS_SESSION_SECRET}' JWT_SECRET: '${JWT_SECRET}' JWT_REFRESH_TOKEN_SECRET: '${JWT_REFRESH_TOKEN_SECRET}' diff --git a/.deploy/ssh/with-cloudflare/stage/docker-compose.api.stage.template.yml b/.deploy/ssh/with-cloudflare/stage/docker-compose.api.stage.template.yml index 4b3e71d3839..bde53f585e2 100644 --- a/.deploy/ssh/with-cloudflare/stage/docker-compose.api.stage.template.yml +++ b/.deploy/ssh/with-cloudflare/stage/docker-compose.api.stage.template.yml @@ -42,6 +42,14 @@ services: WASABI_REGION: '${WASABI_REGION}' WASABI_SERVICE_URL: '${WASABI_SERVICE_URL}' WASABI_S3_BUCKET: '${WASABI_S3_BUCKET}' + WASABI_S3_FORCE_PATH_STYLE: '${WASABI_S3_FORCE_PATH_STYLE:-}' + DIGITALOCEAN_ACCESS_KEY_ID: '${DIGITALOCEAN_ACCESS_KEY_ID:-}' + DIGITALOCEAN_SECRET_ACCESS_KEY: '${DIGITALOCEAN_SECRET_ACCESS_KEY:-}' + DIGITALOCEAN_REGION: '${DIGITALOCEAN_REGION:-}' + DIGITALOCEAN_SERVICE_URL: '${DIGITALOCEAN_SERVICE_URL:-}' + DIGITALOCEAN_CDN_URL: '${DIGITALOCEAN_CDN_URL:-}' + DIGITALOCEAN_S3_BUCKET: '${DIGITALOCEAN_S3_BUCKET:-}' + DIGITALOCEAN_S3_FORCE_PATH_STYLE: '${DIGITALOCEAN_S3_FORCE_PATH_STYLE:-}' EXPRESS_SESSION_SECRET: '${EXPRESS_SESSION_SECRET}' JWT_SECRET: '${JWT_SECRET}' JWT_REFRESH_TOKEN_SECRET: '${JWT_REFRESH_TOKEN_SECRET}' diff --git a/.deploy/ssh/with-letsencrypt/demo/docker-compose.api.demo.template.yml b/.deploy/ssh/with-letsencrypt/demo/docker-compose.api.demo.template.yml index be4de900105..cf2151ed4fb 100644 --- a/.deploy/ssh/with-letsencrypt/demo/docker-compose.api.demo.template.yml +++ b/.deploy/ssh/with-letsencrypt/demo/docker-compose.api.demo.template.yml @@ -42,6 +42,14 @@ services: WASABI_REGION: '${WASABI_REGION:-}' WASABI_SERVICE_URL: '${WASABI_SERVICE_URL:-}' WASABI_S3_BUCKET: '${WASABI_S3_BUCKET:-}' + WASABI_S3_FORCE_PATH_STYLE: '${WASABI_S3_FORCE_PATH_STYLE:-}' + DIGITALOCEAN_ACCESS_KEY_ID: '${DIGITALOCEAN_ACCESS_KEY_ID:-}' + DIGITALOCEAN_SECRET_ACCESS_KEY: '${DIGITALOCEAN_SECRET_ACCESS_KEY:-}' + DIGITALOCEAN_REGION: '${DIGITALOCEAN_REGION:-}' + DIGITALOCEAN_SERVICE_URL: '${DIGITALOCEAN_SERVICE_URL:-}' + DIGITALOCEAN_CDN_URL: '${DIGITALOCEAN_CDN_URL:-}' + DIGITALOCEAN_S3_BUCKET: '${DIGITALOCEAN_S3_BUCKET:-}' + DIGITALOCEAN_S3_FORCE_PATH_STYLE: '${DIGITALOCEAN_S3_FORCE_PATH_STYLE:-}' EXPRESS_SESSION_SECRET: '${EXPRESS_SESSION_SECRET:-}' JWT_SECRET: '${JWT_SECRET:-}' JWT_REFRESH_TOKEN_SECRET: '${JWT_REFRESH_TOKEN_SECRET:-}' diff --git a/.deploy/ssh/with-letsencrypt/prod/docker-compose.api.prod.template.yml b/.deploy/ssh/with-letsencrypt/prod/docker-compose.api.prod.template.yml index 7428da92ac7..1f95f93a66d 100644 --- a/.deploy/ssh/with-letsencrypt/prod/docker-compose.api.prod.template.yml +++ b/.deploy/ssh/with-letsencrypt/prod/docker-compose.api.prod.template.yml @@ -42,6 +42,14 @@ services: WASABI_REGION: '${WASABI_REGION}' WASABI_SERVICE_URL: '${WASABI_SERVICE_URL}' WASABI_S3_BUCKET: '${WASABI_S3_BUCKET}' + WASABI_S3_FORCE_PATH_STYLE: '${WASABI_S3_FORCE_PATH_STYLE:-}' + DIGITALOCEAN_ACCESS_KEY_ID: '${DIGITALOCEAN_ACCESS_KEY_ID:-}' + DIGITALOCEAN_SECRET_ACCESS_KEY: '${DIGITALOCEAN_SECRET_ACCESS_KEY:-}' + DIGITALOCEAN_REGION: '${DIGITALOCEAN_REGION:-}' + DIGITALOCEAN_SERVICE_URL: '${DIGITALOCEAN_SERVICE_URL:-}' + DIGITALOCEAN_CDN_URL: '${DIGITALOCEAN_CDN_URL:-}' + DIGITALOCEAN_S3_BUCKET: '${DIGITALOCEAN_S3_BUCKET:-}' + DIGITALOCEAN_S3_FORCE_PATH_STYLE: '${DIGITALOCEAN_S3_FORCE_PATH_STYLE:-}' EXPRESS_SESSION_SECRET: '${EXPRESS_SESSION_SECRET}' JWT_SECRET: '${JWT_SECRET}' JWT_REFRESH_TOKEN_SECRET: '${JWT_REFRESH_TOKEN_SECRET}' diff --git a/.deploy/ssh/with-letsencrypt/stage/docker-compose.api.stage.template.yml b/.deploy/ssh/with-letsencrypt/stage/docker-compose.api.stage.template.yml index 6472dd893f9..26e09efc6d0 100644 --- a/.deploy/ssh/with-letsencrypt/stage/docker-compose.api.stage.template.yml +++ b/.deploy/ssh/with-letsencrypt/stage/docker-compose.api.stage.template.yml @@ -42,6 +42,14 @@ services: WASABI_REGION: '${WASABI_REGION}' WASABI_SERVICE_URL: '${WASABI_SERVICE_URL}' WASABI_S3_BUCKET: '${WASABI_S3_BUCKET}' + WASABI_S3_FORCE_PATH_STYLE: '${WASABI_S3_FORCE_PATH_STYLE:-}' + DIGITALOCEAN_ACCESS_KEY_ID: '${DIGITALOCEAN_ACCESS_KEY_ID:-}' + DIGITALOCEAN_SECRET_ACCESS_KEY: '${DIGITALOCEAN_SECRET_ACCESS_KEY:-}' + DIGITALOCEAN_REGION: '${DIGITALOCEAN_REGION:-}' + DIGITALOCEAN_SERVICE_URL: '${DIGITALOCEAN_SERVICE_URL:-}' + DIGITALOCEAN_CDN_URL: '${DIGITALOCEAN_CDN_URL:-}' + DIGITALOCEAN_S3_BUCKET: '${DIGITALOCEAN_S3_BUCKET:-}' + DIGITALOCEAN_S3_FORCE_PATH_STYLE: '${DIGITALOCEAN_S3_FORCE_PATH_STYLE:-}' EXPRESS_SESSION_SECRET: '${EXPRESS_SESSION_SECRET}' JWT_SECRET: '${JWT_SECRET}' JWT_REFRESH_TOKEN_SECRET: '${JWT_REFRESH_TOKEN_SECRET}' diff --git a/.do/app.yaml b/.do/app.yaml index bf62fffcaa9..65361b07f0c 100644 --- a/.do/app.yaml +++ b/.do/app.yaml @@ -124,6 +124,30 @@ services: - key: WASABI_S3_BUCKET scope: RUN_TIME value: '$WASABI_S3_BUCKET' + - key: WASABI_S3_FORCE_PATH_STYLE + scope: RUN_TIME + value: '$WASABI_S3_FORCE_PATH_STYLE' + - key: DIGITALOCEAN_ACCESS_KEY_ID + scope: RUN_TIME + value: '$DIGITALOCEAN_ACCESS_KEY_ID' + - key: DIGITALOCEAN_SECRET_ACCESS_KEY + scope: RUN_TIME + value: '$DIGITALOCEAN_SECRET_ACCESS_KEY' + - key: DIGITALOCEAN_REGION + scope: RUN_TIME + value: '$DIGITALOCEAN_REGION' + - key: DIGITALOCEAN_SERVICE_URL + scope: RUN_TIME + value: '$DIGITALOCEAN_SERVICE_URL' + - key: DIGITALOCEAN_CDN_URL + scope: RUN_TIME + value: '$DIGITALOCEAN_CDN_URL' + - key: DIGITALOCEAN_S3_BUCKET + scope: RUN_TIME + value: '$DIGITALOCEAN_S3_BUCKET' + - key: DIGITALOCEAN_S3_FORCE_PATH_STYLE + scope: RUN_TIME + value: '$DIGITALOCEAN_S3_FORCE_PATH_STYLE' - key: EXPRESS_SESSION_SECRET scope: RUN_TIME value: '$EXPRESS_SESSION_SECRET' diff --git a/.env.compose b/.env.compose index e5d2d38931c..d2a044ba155 100644 --- a/.env.compose +++ b/.env.compose @@ -200,6 +200,16 @@ WASABI_SECRET_ACCESS_KEY= WASABI_REGION=us-east-1 WASABI_SERVICE_URL=https://s3.wasabisys.com WASABI_S3_BUCKET=gauzy +WASABI_S3_FORCE_PATH_STYLE=false + +# DIGITALOCEAN Spaces Config (optional) +DIGITALOCEAN_ACCESS_KEY_ID= +DIGITALOCEAN_SECRET_ACCESS_KEY= +DIGITALOCEAN_REGION=us-east-1 +DIGITALOCEAN_SERVICE_URL= +DIGITALOCEAN_CDN_URL= +DIGITALOCEAN_S3_BUCKET=gauzy +DIGITALOCEAN_S3_FORCE_PATH_STYLE=false # Cloudinary Config (optional) CLOUDINARY_CLOUD_NAME= diff --git a/.env.demo.compose b/.env.demo.compose index 98df33830ec..78d973eb3f8 100644 --- a/.env.demo.compose +++ b/.env.demo.compose @@ -202,6 +202,16 @@ WASABI_SECRET_ACCESS_KEY= WASABI_REGION=us-east-1 WASABI_SERVICE_URL=https://s3.wasabisys.com WASABI_S3_BUCKET=gauzy +WASABI_S3_FORCE_PATH_STYLE=true + +# DIGITALOCEAN Spaces Config (optional) +DIGITALOCEAN_ACCESS_KEY_ID= +DIGITALOCEAN_SECRET_ACCESS_KEY= +DIGITALOCEAN_REGION=us-east-1 +DIGITALOCEAN_SERVICE_URL= +DIGITALOCEAN_CDN_URL= +DIGITALOCEAN_S3_BUCKET=gauzy +DIGITALOCEAN_S3_FORCE_PATH_STYLE=false # Cloudinary Config (optional) CLOUDINARY_CLOUD_NAME= diff --git a/.env.docker b/.env.docker index 60fa75543a9..2b71475b4aa 100644 --- a/.env.docker +++ b/.env.docker @@ -187,6 +187,16 @@ WASABI_SECRET_ACCESS_KEY= WASABI_REGION=us-east-1 WASABI_SERVICE_URL=https://s3.wasabisys.com WASABI_S3_BUCKET=gauzy +WASABI_S3_FORCE_PATH_STYLE=true + +# DIGITALOCEAN Spaces Config (optional) +DIGITALOCEAN_ACCESS_KEY_ID= +DIGITALOCEAN_SECRET_ACCESS_KEY= +DIGITALOCEAN_REGION=us-east-1 +DIGITALOCEAN_SERVICE_URL= +DIGITALOCEAN_CDN_URL= +DIGITALOCEAN_S3_BUCKET=gauzy +DIGITALOCEAN_S3_FORCE_PATH_STYLE=false # Cloudinary Config (optional) CLOUDINARY_CLOUD_NAME= diff --git a/.env.local b/.env.local index dac6768b0a7..c9a70171361 100644 --- a/.env.local +++ b/.env.local @@ -189,6 +189,16 @@ WASABI_SECRET_ACCESS_KEY= WASABI_REGION=us-east-1 WASABI_SERVICE_URL=https://s3.wasabisys.com WASABI_S3_BUCKET=gauzy +WASABI_S3_FORCE_PATH_STYLE=true + +# DIGITALOCEAN Spaces Config (optional) +DIGITALOCEAN_ACCESS_KEY_ID= +DIGITALOCEAN_SECRET_ACCESS_KEY= +DIGITALOCEAN_REGION=us-east-1 +DIGITALOCEAN_SERVICE_URL= +DIGITALOCEAN_CDN_URL= +DIGITALOCEAN_S3_BUCKET=gauzy +DIGITALOCEAN_S3_FORCE_PATH_STYLE=false # Cloudinary Config (optional) CLOUDINARY_CLOUD_NAME= diff --git a/.env.sample b/.env.sample index 17c22f87df7..c55b9abe770 100644 --- a/.env.sample +++ b/.env.sample @@ -185,6 +185,16 @@ WASABI_SECRET_ACCESS_KEY= WASABI_REGION=us-east-1 WASABI_SERVICE_URL=https://s3.wasabisys.com WASABI_S3_BUCKET=gauzy +WASABI_S3_FORCE_PATH_STYLE=true + +# DIGITALOCEAN Spaces Config (optional) +DIGITALOCEAN_ACCESS_KEY_ID= +DIGITALOCEAN_SECRET_ACCESS_KEY= +DIGITALOCEAN_REGION=us-east-1 +DIGITALOCEAN_SERVICE_URL= +DIGITALOCEAN_CDN_URL= +DIGITALOCEAN_S3_BUCKET=gauzy +DIGITALOCEAN_S3_FORCE_PATH_STYLE=false # Cloudinary Config (optional) CLOUDINARY_CLOUD_NAME= diff --git a/.github/workflows/deploy-civo-prod.yml b/.github/workflows/deploy-civo-prod.yml index 5818e8dd542..12308dbfe7c 100644 --- a/.github/workflows/deploy-civo-prod.yml +++ b/.github/workflows/deploy-civo-prod.yml @@ -73,6 +73,14 @@ jobs: WASABI_REGION: '${{ secrets.WASABI_REGION }}' WASABI_SERVICE_URL: '${{ secrets.WASABI_SERVICE_URL }}' WASABI_S3_BUCKET: '${{ secrets.WASABI_S3_BUCKET }}' + WASABI_S3_FORCE_PATH_STYLE: '${{ secrets.WASABI_S3_FORCE_PATH_STYLE }}' + DIGITALOCEAN_ACCESS_KEY_ID: '${{ secrets.DIGITALOCEAN_ACCESS_KEY_ID }}' + DIGITALOCEAN_SECRET_ACCESS_KEY: '${{ secrets.DIGITALOCEAN_SECRET_ACCESS_KEY }}' + DIGITALOCEAN_REGION: '${{ secrets.DIGITALOCEAN_REGION }}' + DIGITALOCEAN_SERVICE_URL: '${{ secrets.DIGITALOCEAN_SERVICE_URL }}' + DIGITALOCEAN_CDN_URL: '${{ secrets.DIGITALOCEAN_CDN_URL }}' + DIGITALOCEAN_S3_BUCKET: '${{ secrets.DIGITALOCEAN_S3_BUCKET }}' + DIGITALOCEAN_S3_FORCE_PATH_STYLE: '${{ secrets.DIGITALOCEAN_S3_FORCE_PATH_STYLE }}' EXPRESS_SESSION_SECRET: '${{ secrets.EXPRESS_SESSION_SECRET }}' JWT_SECRET: '${{ secrets.JWT_SECRET }}' JWT_REFRESH_TOKEN_SECRET: '${{ secrets.JWT_REFRESH_TOKEN_SECRET }}' diff --git a/.github/workflows/deploy-civo-stage.yml b/.github/workflows/deploy-civo-stage.yml index 97e1be8448c..51baaba45a2 100644 --- a/.github/workflows/deploy-civo-stage.yml +++ b/.github/workflows/deploy-civo-stage.yml @@ -74,6 +74,14 @@ jobs: WASABI_REGION: '${{ secrets.WASABI_REGION }}' WASABI_SERVICE_URL: '${{ secrets.WASABI_SERVICE_URL }}' WASABI_S3_BUCKET: '${{ secrets.WASABI_S3_BUCKET }}' + WASABI_S3_FORCE_PATH_STYLE: '${{ secrets.WASABI_S3_FORCE_PATH_STYLE }}' + DIGITALOCEAN_ACCESS_KEY_ID: '${{ secrets.DIGITALOCEAN_ACCESS_KEY_ID }}' + DIGITALOCEAN_SECRET_ACCESS_KEY: '${{ secrets.DIGITALOCEAN_SECRET_ACCESS_KEY }}' + DIGITALOCEAN_REGION: '${{ secrets.DIGITALOCEAN_REGION }}' + DIGITALOCEAN_SERVICE_URL: '${{ secrets.DIGITALOCEAN_SERVICE_URL }}' + DIGITALOCEAN_CDN_URL: '${{ secrets.DIGITALOCEAN_CDN_URL }}' + DIGITALOCEAN_S3_BUCKET: '${{ secrets.DIGITALOCEAN_S3_BUCKET }}' + DIGITALOCEAN_S3_FORCE_PATH_STYLE: '${{ secrets.DIGITALOCEAN_S3_FORCE_PATH_STYLE }}' EXPRESS_SESSION_SECRET: '${{ secrets.EXPRESS_SESSION_SECRET }}' JWT_SECRET: '${{ secrets.JWT_SECRET }}' JWT_REFRESH_TOKEN_SECRET: '${{ secrets.JWT_REFRESH_TOKEN_SECRET }}' diff --git a/.github/workflows/deploy-cw-prod.yml b/.github/workflows/deploy-cw-prod.yml index 414acb3adf5..46e00ba1352 100644 --- a/.github/workflows/deploy-cw-prod.yml +++ b/.github/workflows/deploy-cw-prod.yml @@ -73,6 +73,14 @@ jobs: WASABI_REGION: '${{ secrets.WASABI_REGION }}' WASABI_SERVICE_URL: '${{ secrets.WASABI_SERVICE_URL }}' WASABI_S3_BUCKET: '${{ secrets.WASABI_S3_BUCKET }}' + WASABI_S3_FORCE_PATH_STYLE: '${{ secrets.WASABI_S3_FORCE_PATH_STYLE }}' + DIGITALOCEAN_ACCESS_KEY_ID: '${{ secrets.DIGITALOCEAN_ACCESS_KEY_ID }}' + DIGITALOCEAN_SECRET_ACCESS_KEY: '${{ secrets.DIGITALOCEAN_SECRET_ACCESS_KEY }}' + DIGITALOCEAN_REGION: '${{ secrets.DIGITALOCEAN_REGION }}' + DIGITALOCEAN_SERVICE_URL: '${{ secrets.DIGITALOCEAN_SERVICE_URL }}' + DIGITALOCEAN_CDN_URL: '${{ secrets.DIGITALOCEAN_CDN_URL }}' + DIGITALOCEAN_S3_BUCKET: '${{ secrets.DIGITALOCEAN_S3_BUCKET }}' + DIGITALOCEAN_S3_FORCE_PATH_STYLE: '${{ secrets.DIGITALOCEAN_S3_FORCE_PATH_STYLE }}' EXPRESS_SESSION_SECRET: '${{ secrets.EXPRESS_SESSION_SECRET }}' JWT_SECRET: '${{ secrets.JWT_SECRET }}' JWT_REFRESH_TOKEN_SECRET: '${{ secrets.JWT_REFRESH_TOKEN_SECRET }}' diff --git a/.github/workflows/deploy-cw-stage.yml b/.github/workflows/deploy-cw-stage.yml index 08d9724e708..5720be8ea4a 100644 --- a/.github/workflows/deploy-cw-stage.yml +++ b/.github/workflows/deploy-cw-stage.yml @@ -74,6 +74,14 @@ jobs: WASABI_REGION: '${{ secrets.WASABI_REGION }}' WASABI_SERVICE_URL: '${{ secrets.WASABI_SERVICE_URL }}' WASABI_S3_BUCKET: '${{ secrets.WASABI_S3_BUCKET }}' + WASABI_S3_FORCE_PATH_STYLE: '${{ secrets.WASABI_S3_FORCE_PATH_STYLE }}' + DIGITALOCEAN_ACCESS_KEY_ID: '${{ secrets.DIGITALOCEAN_ACCESS_KEY_ID }}' + DIGITALOCEAN_SECRET_ACCESS_KEY: '${{ secrets.DIGITALOCEAN_SECRET_ACCESS_KEY }}' + DIGITALOCEAN_REGION: '${{ secrets.DIGITALOCEAN_REGION }}' + DIGITALOCEAN_SERVICE_URL: '${{ secrets.DIGITALOCEAN_SERVICE_URL }}' + DIGITALOCEAN_CDN_URL: '${{ secrets.DIGITALOCEAN_CDN_URL }}' + DIGITALOCEAN_S3_BUCKET: '${{ secrets.DIGITALOCEAN_S3_BUCKET }}' + DIGITALOCEAN_S3_FORCE_PATH_STYLE: '${{ secrets.DIGITALOCEAN_S3_FORCE_PATH_STYLE }}' EXPRESS_SESSION_SECRET: '${{ secrets.EXPRESS_SESSION_SECRET }}' JWT_SECRET: '${{ secrets.JWT_SECRET }}' JWT_REFRESH_TOKEN_SECRET: '${{ secrets.JWT_REFRESH_TOKEN_SECRET }}' diff --git a/.github/workflows/deploy-do-app-platform-demo.yml b/.github/workflows/deploy-do-app-platform-demo.yml index a292d22f2dd..6667bcc795e 100644 --- a/.github/workflows/deploy-do-app-platform-demo.yml +++ b/.github/workflows/deploy-do-app-platform-demo.yml @@ -71,6 +71,14 @@ jobs: WASABI_REGION: '${{ secrets.WASABI_REGION }}' WASABI_SERVICE_URL: '${{ secrets.WASABI_SERVICE_URL }}' WASABI_S3_BUCKET: '${{ secrets.WASABI_S3_BUCKET }}' + WASABI_S3_FORCE_PATH_STYLE: '${{ secrets.WASABI_S3_FORCE_PATH_STYLE }}' + DIGITALOCEAN_ACCESS_KEY_ID: '${{ secrets.DIGITALOCEAN_ACCESS_KEY_ID }}' + DIGITALOCEAN_SECRET_ACCESS_KEY: '${{ secrets.DIGITALOCEAN_SECRET_ACCESS_KEY }}' + DIGITALOCEAN_REGION: '${{ secrets.DIGITALOCEAN_REGION }}' + DIGITALOCEAN_SERVICE_URL: '${{ secrets.DIGITALOCEAN_SERVICE_URL }}' + DIGITALOCEAN_CDN_URL: '${{ secrets.DIGITALOCEAN_CDN_URL }}' + DIGITALOCEAN_S3_BUCKET: '${{ secrets.DIGITALOCEAN_S3_BUCKET }}' + DIGITALOCEAN_S3_FORCE_PATH_STYLE: '${{ secrets.DIGITALOCEAN_S3_FORCE_PATH_STYLE }}' EXPRESS_SESSION_SECRET: '${{ secrets.EXPRESS_SESSION_SECRET }}' JWT_SECRET: '${{ secrets.JWT_SECRET }}' JWT_REFRESH_TOKEN_SECRET: '${{ secrets.JWT_REFRESH_TOKEN_SECRET }}' diff --git a/.github/workflows/deploy-do-app-platform-prod.yml b/.github/workflows/deploy-do-app-platform-prod.yml index 86cbce2769c..63af579537a 100644 --- a/.github/workflows/deploy-do-app-platform-prod.yml +++ b/.github/workflows/deploy-do-app-platform-prod.yml @@ -71,6 +71,14 @@ jobs: WASABI_REGION: '${{ secrets.WASABI_REGION }}' WASABI_SERVICE_URL: '${{ secrets.WASABI_SERVICE_URL }}' WASABI_S3_BUCKET: '${{ secrets.WASABI_S3_BUCKET }}' + WASABI_S3_FORCE_PATH_STYLE: '${{ secrets.WASABI_S3_FORCE_PATH_STYLE }}' + DIGITALOCEAN_ACCESS_KEY_ID: '${{ secrets.DIGITALOCEAN_ACCESS_KEY_ID }}' + DIGITALOCEAN_SECRET_ACCESS_KEY: '${{ secrets.DIGITALOCEAN_SECRET_ACCESS_KEY }}' + DIGITALOCEAN_REGION: '${{ secrets.DIGITALOCEAN_REGION }}' + DIGITALOCEAN_SERVICE_URL: '${{ secrets.DIGITALOCEAN_SERVICE_URL }}' + DIGITALOCEAN_CDN_URL: '${{ secrets.DIGITALOCEAN_CDN_URL }}' + DIGITALOCEAN_S3_BUCKET: '${{ secrets.DIGITALOCEAN_S3_BUCKET }}' + DIGITALOCEAN_S3_FORCE_PATH_STYLE: '${{ secrets.DIGITALOCEAN_S3_FORCE_PATH_STYLE }}' EXPRESS_SESSION_SECRET: '${{ secrets.EXPRESS_SESSION_SECRET }}' JWT_SECRET: '${{ secrets.JWT_SECRET }}' JWT_REFRESH_TOKEN_SECRET: '${{ secrets.JWT_REFRESH_TOKEN_SECRET }}' diff --git a/.github/workflows/deploy-do-app-platform-stage.yml b/.github/workflows/deploy-do-app-platform-stage.yml index e7c8b16e01e..1d88af2669a 100644 --- a/.github/workflows/deploy-do-app-platform-stage.yml +++ b/.github/workflows/deploy-do-app-platform-stage.yml @@ -71,6 +71,14 @@ jobs: WASABI_REGION: '${{ secrets.WASABI_REGION }}' WASABI_SERVICE_URL: '${{ secrets.WASABI_SERVICE_URL }}' WASABI_S3_BUCKET: '${{ secrets.WASABI_S3_BUCKET }}' + WASABI_S3_FORCE_PATH_STYLE: '${{ secrets.WASABI_S3_FORCE_PATH_STYLE }}' + DIGITALOCEAN_ACCESS_KEY_ID: '${{ secrets.DIGITALOCEAN_ACCESS_KEY_ID }}' + DIGITALOCEAN_SECRET_ACCESS_KEY: '${{ secrets.DIGITALOCEAN_SECRET_ACCESS_KEY }}' + DIGITALOCEAN_REGION: '${{ secrets.DIGITALOCEAN_REGION }}' + DIGITALOCEAN_SERVICE_URL: '${{ secrets.DIGITALOCEAN_SERVICE_URL }}' + DIGITALOCEAN_CDN_URL: '${{ secrets.DIGITALOCEAN_CDN_URL }}' + DIGITALOCEAN_S3_BUCKET: '${{ secrets.DIGITALOCEAN_S3_BUCKET }}' + DIGITALOCEAN_S3_FORCE_PATH_STYLE: '${{ secrets.DIGITALOCEAN_S3_FORCE_PATH_STYLE }}' EXPRESS_SESSION_SECRET: '${{ secrets.EXPRESS_SESSION_SECRET }}' JWT_SECRET: '${{ secrets.JWT_SECRET }}' JWT_REFRESH_TOKEN_SECRET: '${{ secrets.JWT_REFRESH_TOKEN_SECRET }}' diff --git a/.github/workflows/deploy-do-droplet-demo.yml b/.github/workflows/deploy-do-droplet-demo.yml index 752ee258331..04f8a1600eb 100644 --- a/.github/workflows/deploy-do-droplet-demo.yml +++ b/.github/workflows/deploy-do-droplet-demo.yml @@ -79,6 +79,14 @@ jobs: WASABI_REGION: '${{ secrets.WASABI_REGION }}' WASABI_SERVICE_URL: '${{ secrets.WASABI_SERVICE_URL }}' WASABI_S3_BUCKET: '${{ secrets.WASABI_S3_BUCKET }}' + WASABI_S3_FORCE_PATH_STYLE: '${{ secrets.WASABI_S3_FORCE_PATH_STYLE }}' + DIGITALOCEAN_ACCESS_KEY_ID: '${{ secrets.DIGITALOCEAN_ACCESS_KEY_ID }}' + DIGITALOCEAN_SECRET_ACCESS_KEY: '${{ secrets.DIGITALOCEAN_SECRET_ACCESS_KEY }}' + DIGITALOCEAN_REGION: '${{ secrets.DIGITALOCEAN_REGION }}' + DIGITALOCEAN_SERVICE_URL: '${{ secrets.DIGITALOCEAN_SERVICE_URL }}' + DIGITALOCEAN_CDN_URL: '${{ secrets.DIGITALOCEAN_CDN_URL }}' + DIGITALOCEAN_S3_BUCKET: '${{ secrets.DIGITALOCEAN_S3_BUCKET }}' + DIGITALOCEAN_S3_FORCE_PATH_STYLE: '${{ secrets.DIGITALOCEAN_S3_FORCE_PATH_STYLE }}' EXPRESS_SESSION_SECRET: '${{ secrets.EXPRESS_SESSION_SECRET }}' JWT_SECRET: '${{ secrets.JWT_SECRET }}' JWT_REFRESH_TOKEN_SECRET: '${{ secrets.JWT_REFRESH_TOKEN_SECRET }}' diff --git a/.github/workflows/deploy-do-droplet-prod.yml b/.github/workflows/deploy-do-droplet-prod.yml index 53955244907..eb56b5f870a 100644 --- a/.github/workflows/deploy-do-droplet-prod.yml +++ b/.github/workflows/deploy-do-droplet-prod.yml @@ -79,6 +79,14 @@ jobs: WASABI_REGION: '${{ secrets.WASABI_REGION }}' WASABI_SERVICE_URL: '${{ secrets.WASABI_SERVICE_URL }}' WASABI_S3_BUCKET: '${{ secrets.WASABI_S3_BUCKET }}' + WASABI_S3_FORCE_PATH_STYLE: '${{ secrets.WASABI_S3_FORCE_PATH_STYLE }}' + DIGITALOCEAN_ACCESS_KEY_ID: '${{ secrets.DIGITALOCEAN_ACCESS_KEY_ID }}' + DIGITALOCEAN_SECRET_ACCESS_KEY: '${{ secrets.DIGITALOCEAN_SECRET_ACCESS_KEY }}' + DIGITALOCEAN_REGION: '${{ secrets.DIGITALOCEAN_REGION }}' + DIGITALOCEAN_SERVICE_URL: '${{ secrets.DIGITALOCEAN_SERVICE_URL }}' + DIGITALOCEAN_CDN_URL: '${{ secrets.DIGITALOCEAN_CDN_URL }}' + DIGITALOCEAN_S3_BUCKET: '${{ secrets.DIGITALOCEAN_S3_BUCKET }}' + DIGITALOCEAN_S3_FORCE_PATH_STYLE: '${{ secrets.DIGITALOCEAN_S3_FORCE_PATH_STYLE }}' EXPRESS_SESSION_SECRET: '${{ secrets.EXPRESS_SESSION_SECRET }}' JWT_SECRET: '${{ secrets.JWT_SECRET }}' JWT_REFRESH_TOKEN_SECRET: '${{ secrets.JWT_REFRESH_TOKEN_SECRET }}' diff --git a/.github/workflows/deploy-do-droplet-stage.yml b/.github/workflows/deploy-do-droplet-stage.yml index fc4597ed72f..8699b2415ca 100644 --- a/.github/workflows/deploy-do-droplet-stage.yml +++ b/.github/workflows/deploy-do-droplet-stage.yml @@ -79,6 +79,14 @@ jobs: WASABI_REGION: '${{ secrets.WASABI_REGION }}' WASABI_SERVICE_URL: '${{ secrets.WASABI_SERVICE_URL }}' WASABI_S3_BUCKET: '${{ secrets.WASABI_S3_BUCKET }}' + WASABI_S3_FORCE_PATH_STYLE: '${{ secrets.WASABI_S3_FORCE_PATH_STYLE }}' + DIGITALOCEAN_ACCESS_KEY_ID: '${{ secrets.DIGITALOCEAN_ACCESS_KEY_ID }}' + DIGITALOCEAN_SECRET_ACCESS_KEY: '${{ secrets.DIGITALOCEAN_SECRET_ACCESS_KEY }}' + DIGITALOCEAN_REGION: '${{ secrets.DIGITALOCEAN_REGION }}' + DIGITALOCEAN_SERVICE_URL: '${{ secrets.DIGITALOCEAN_SERVICE_URL }}' + DIGITALOCEAN_CDN_URL: '${{ secrets.DIGITALOCEAN_CDN_URL }}' + DIGITALOCEAN_S3_BUCKET: '${{ secrets.DIGITALOCEAN_S3_BUCKET }}' + DIGITALOCEAN_S3_FORCE_PATH_STYLE: '${{ secrets.DIGITALOCEAN_S3_FORCE_PATH_STYLE }}' EXPRESS_SESSION_SECRET: '${{ secrets.EXPRESS_SESSION_SECRET }}' JWT_SECRET: '${{ secrets.JWT_SECRET }}' JWT_REFRESH_TOKEN_SECRET: '${{ secrets.JWT_REFRESH_TOKEN_SECRET }}' diff --git a/.github/workflows/deploy-do-prod.yml b/.github/workflows/deploy-do-prod.yml index 0241c88a5dc..231ce37bb99 100644 --- a/.github/workflows/deploy-do-prod.yml +++ b/.github/workflows/deploy-do-prod.yml @@ -68,6 +68,14 @@ jobs: WASABI_REGION: '${{ secrets.WASABI_REGION }}' WASABI_SERVICE_URL: '${{ secrets.WASABI_SERVICE_URL }}' WASABI_S3_BUCKET: '${{ secrets.WASABI_S3_BUCKET }}' + WASABI_S3_FORCE_PATH_STYLE: '${{ secrets.WASABI_S3_FORCE_PATH_STYLE }}' + DIGITALOCEAN_ACCESS_KEY_ID: '${{ secrets.DIGITALOCEAN_ACCESS_KEY_ID }}' + DIGITALOCEAN_SECRET_ACCESS_KEY: '${{ secrets.DIGITALOCEAN_SECRET_ACCESS_KEY }}' + DIGITALOCEAN_REGION: '${{ secrets.DIGITALOCEAN_REGION }}' + DIGITALOCEAN_SERVICE_URL: '${{ secrets.DIGITALOCEAN_SERVICE_URL }}' + DIGITALOCEAN_CDN_URL: '${{ secrets.DIGITALOCEAN_CDN_URL }}' + DIGITALOCEAN_S3_BUCKET: '${{ secrets.DIGITALOCEAN_S3_BUCKET }}' + DIGITALOCEAN_S3_FORCE_PATH_STYLE: '${{ secrets.DIGITALOCEAN_S3_FORCE_PATH_STYLE }}' EXPRESS_SESSION_SECRET: '${{ secrets.EXPRESS_SESSION_SECRET }}' JWT_SECRET: '${{ secrets.JWT_SECRET }}' JWT_REFRESH_TOKEN_SECRET: '${{ secrets.JWT_REFRESH_TOKEN_SECRET }}' diff --git a/.github/workflows/deploy-do-stage.yml b/.github/workflows/deploy-do-stage.yml index 5c9500c3d1b..439f8eb3da4 100644 --- a/.github/workflows/deploy-do-stage.yml +++ b/.github/workflows/deploy-do-stage.yml @@ -69,6 +69,14 @@ jobs: WASABI_REGION: '${{ secrets.WASABI_REGION }}' WASABI_SERVICE_URL: '${{ secrets.WASABI_SERVICE_URL }}' WASABI_S3_BUCKET: '${{ secrets.WASABI_S3_BUCKET }}' + WASABI_S3_FORCE_PATH_STYLE: '${{ secrets.WASABI_S3_FORCE_PATH_STYLE }}' + DIGITALOCEAN_ACCESS_KEY_ID: '${{ secrets.DIGITALOCEAN_ACCESS_KEY_ID }}' + DIGITALOCEAN_SECRET_ACCESS_KEY: '${{ secrets.DIGITALOCEAN_SECRET_ACCESS_KEY }}' + DIGITALOCEAN_REGION: '${{ secrets.DIGITALOCEAN_REGION }}' + DIGITALOCEAN_SERVICE_URL: '${{ secrets.DIGITALOCEAN_SERVICE_URL }}' + DIGITALOCEAN_CDN_URL: '${{ secrets.DIGITALOCEAN_CDN_URL }}' + DIGITALOCEAN_S3_BUCKET: '${{ secrets.DIGITALOCEAN_S3_BUCKET }}' + DIGITALOCEAN_S3_FORCE_PATH_STYLE: '${{ secrets.DIGITALOCEAN_S3_FORCE_PATH_STYLE }}' EXPRESS_SESSION_SECRET: '${{ secrets.EXPRESS_SESSION_SECRET }}' JWT_SECRET: '${{ secrets.JWT_SECRET }}' JWT_REFRESH_TOKEN_SECRET: '${{ secrets.JWT_REFRESH_TOKEN_SECRET }}' diff --git a/packages/config/src/environments/environment.prod.ts b/packages/config/src/environments/environment.prod.ts index 8aa56f9279d..e7b92375fb4 100644 --- a/packages/config/src/environments/environment.prod.ts +++ b/packages/config/src/environments/environment.prod.ts @@ -105,7 +105,7 @@ export const environment: IEnvironment = { accessKeyId: process.env.DIGITALOCEAN_ACCESS_KEY_ID, secretAccessKey: process.env.DIGITALOCEAN_SECRET_ACCESS_KEY, region: process.env.DIGITALOCEAN_REGION || 'us-east-1', - serviceUrl: process.env.DIGITALOCEAN_SERVICE_URL || 'https://gauzy.sfo2.digitaloceanspaces.com', // Find your endpoint in the control panel, under Settings. Prepend "https://". + serviceUrl: process.env.DIGITALOCEAN_SERVICE_URL || 'https://gauzy.sfo2.digitaloceanspaces.com', // Find your endpoint in the control panel, under Settings. Prepend "https://". cdnUrl: process.env.DIGITALOCEAN_CDN_URL, s3: { bucket: process.env.DIGITALOCEAN_S3_BUCKET || 'gauzy',