MAGICGrants/strapi
1
0
Fork 0
mirror of https://github.com/MAGICGrants/strapi.git synced 2026-01-08 20:27:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: use correct settings for s3 compatible services

Browse Source
This commit is contained in:
Artur
2024-11-29 21:13:36 -03:00
parent 64e24df152
commit 66de9fc0ee
4 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/deploy.yml vendored
View File

@@ -30,12 +30,12 @@ jobs:
ADMIN_JWT_SECRET=${{ secrets.ADMIN_JWT_SECRET }} \ ADMIN_JWT_SECRET=${{ secrets.ADMIN_JWT_SECRET }} \
TRANSFER_TOKEN_SALT=${{ secrets.TRANSFER_TOKEN_SALT }} \ TRANSFER_TOKEN_SALT=${{ secrets.TRANSFER_TOKEN_SALT }} \
DATABASE_PASSWORD=${{ secrets.DATABASE_PASSWORD }} \ DATABASE_PASSWORD=${{ secrets.DATABASE_PASSWORD }} \
AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }} \ HETZNER_BUCKET_ACCESS_KEY_ID=${{ secrets.HETZNER_BUCKET_ACCESS_KEY_ID }} \
AWS_ACCESS_SECRET=${{ secrets.AWS_ACCESS_SECRET }} \ HETZNER_BUCKET_ACCESS_SECRET=${{ secrets.HETZNER_BUCKET_ACCESS_SECRET }} \
AWS_REGION=${{ secrets.AWS_REGION }} \ HETZNER_BUCKET_REGION=${{ secrets.HETZNER_BUCKET_REGION }} \
AWS_BUCKET=${{ secrets.AWS_BUCKET }} \ HETZNER_BUCKET_NAME=${{ secrets.HETZNER_BUCKET_NAME }} \
CDN_URL=${{ secrets.CDN_URL }} \ HETZNER_BUCKET_ENDPOINT=${{ secrets.HETZNER_BUCKET_ENDPOINT }} \
CDN_ROOT_PATH=${{ secrets.CDN_ROOT_PATH }} \ HETZNER_BUCKET_HOST=${{ secrets.HETZNER_BUCKET_HOST }} \
CLOUDFLARE_TUNNEL_TOKEN=${{ secrets.CLOUDFLARE_TUNNEL_TOKEN }} \ CLOUDFLARE_TUNNEL_TOKEN=${{ secrets.CLOUDFLARE_TUNNEL_TOKEN }} \
docker compose -f docker-compose.prod.yml up -d --build docker compose -f docker-compose.prod.yml up -d --build
EOF EOF

4
config/middlewares.ts
View File

@@ -21,14 +21,14 @@ export default ({ env }) => [
"data:", "data:",
"blob:", "blob:",
"market-assets.strapi.io", "market-assets.strapi.io",
`${env("AWS_BUCKET")}.s3.${env("AWS_REGION")}.amazonaws.com`, env("HETZNER_BUCKET_HOST"),
], ],
"media-src": [ "media-src": [
"'self'", "'self'",
"data:", "data:",
"blob:", "blob:",
"market-assets.strapi.io", "market-assets.strapi.io",
`${env("AWS_BUCKET")}.s3.${env("AWS_REGION")}.amazonaws.com`, env("HETZNER_BUCKET_HOST"),
], ],
upgradeInsecureRequests: null, upgradeInsecureRequests: null,
}, },

19
config/plugins.ts
View File

@@ -4,17 +4,14 @@ export default ({ env }) => ({
config: { config: {
provider: "aws-s3", provider: "aws-s3",
providerOptions: { providerOptions: {
baseUrl: env("CDN_URL"), credentials: {
rootPath: env("CDN_ROOT_PATH"), accessKeyId: env("HETZNER_BUCKET_ACCESS_KEY_ID"),
s3Options: { secretAccessKey: env("HETZNER_BUCKET_ACCESS_SECRET"),
accessKeyId: env("AWS_ACCESS_KEY_ID"), },
secretAccessKey: env("AWS_ACCESS_SECRET"), region: env("HETZNER_BUCKET_REGION"),
region: env("AWS_REGION"), endpoint: env("HETZNER_BUCKET_ENDPOINT"),
params: { params: {
ACL: env("AWS_ACL", "private"), Bucket: env("HETZNER_BUCKET_NAME"),
signedUrlExpires: env("AWS_SIGNED_URL_EXPIRES", 15 * 60),
Bucket: env("AWS_BUCKET"),
},
}, },
}, },
actionOptions: { actionOptions: {

12
docker-compose.prod.yml
View File

@@ -38,12 +38,12 @@ services:
API_TOKEN_SALT: ${API_TOKEN_SALT} API_TOKEN_SALT: ${API_TOKEN_SALT}
TRANSFER_TOKEN_SALT: ${TRANSFER_TOKEN_SALT} TRANSFER_TOKEN_SALT: ${TRANSFER_TOKEN_SALT}
ADMIN_JWT_SECRET: ${ADMIN_JWT_SECRET} ADMIN_JWT_SECRET: ${ADMIN_JWT_SECRET}
AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID} HETZNER_BUCKET_ACCESS_KEY_ID: ${HETZNER_BUCKET_ACCESS_KEY_ID}
AWS_ACCESS_SECRET: ${AWS_ACCESS_SECRET} HETZNER_BUCKET_ACCESS_SECRET: ${HETZNER_BUCKET_ACCESS_SECRET}
AWS_REGION: ${AWS_REGION} HETZNER_BUCKET_REGION: ${HETZNER_BUCKET_REGION}
AWS_BUCKET: ${AWS_BUCKET} HETZNER_BUCKET_NAME: ${HETZNER_BUCKET_NAME}
CDN_URL: ${CDN_URL} HETZNER_BUCKET_ENDPOINT: ${HETZNER_BUCKET_ENDPOINT}
CDN_ROOT_PATH: ${CDN_ROOT_PATH} HETZNER_BUCKET_HOST: ${HETZNER_BUCKET_HOST}
volumes: volumes:
- ./config:/opt/app/config - ./config:/opt/app/config
- ./src:/opt/app/src - ./src:/opt/app/src