From 6d5bd5fbcaefb0384f598c4bd3ee67662d5dae78 Mon Sep 17 00:00:00 2001 From: Salim B Date: Tue, 23 Jul 2024 15:37:18 +0200 Subject: [PATCH 1/2] fix: consider `NC_S3_ENDPOINT` besides `NC_S3_REGION` --- packages/nocodb/src/helpers/NcPluginMgrv2.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/nocodb/src/helpers/NcPluginMgrv2.ts b/packages/nocodb/src/helpers/NcPluginMgrv2.ts index b3e647351d..d9e21b33cc 100644 --- a/packages/nocodb/src/helpers/NcPluginMgrv2.ts +++ b/packages/nocodb/src/helpers/NcPluginMgrv2.ts @@ -116,13 +116,14 @@ class NcPluginMgrv2 { /* * NC_S3_BUCKET_NAME * NC_S3_REGION + * NC_S3_ENDPOINT * NC_S3_ACCESS_KEY * NC_S3_ACCESS_SECRET * */ if ( process.env.NC_S3_BUCKET_NAME && - process.env.NC_S3_REGION && + (process.env.NC_S3_REGION || process.env.NC_S3_ENDPOINT) && process.env.NC_S3_ACCESS_KEY && process.env.NC_S3_ACCESS_SECRET ) { From dc4048c51640988da001e08923530ba9e1608dfd Mon Sep 17 00:00:00 2001 From: Salim B Date: Tue, 13 Aug 2024 18:28:10 +0200 Subject: [PATCH 2/2] Update 020.environment-variables.md docs: mention that `NC_S3_ENDPOINT` takes precedence over `NC_S3_REGION` --- .../050.self-hosted/020.environment-variables.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/noco-docs/docs/020.getting-started/050.self-hosted/020.environment-variables.md b/packages/noco-docs/docs/020.getting-started/050.self-hosted/020.environment-variables.md index 486c88db35..d12f10349a 100644 --- a/packages/noco-docs/docs/020.getting-started/050.self-hosted/020.environment-variables.md +++ b/packages/noco-docs/docs/020.getting-started/050.self-hosted/020.environment-variables.md @@ -31,7 +31,7 @@ For production use cases, it is crucial to set all environment variables marked | Variable | Mandatory | Description | If Not Set | | -------- | --------- |----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------| | `NC_S3_BUCKET_NAME` | No | The name of the AWS S3 bucket used for the S3 storage plugin. | | -| `NC_S3_REGION` | No | The AWS S3 region where the S3 storage plugin bucket is located. | | +| `NC_S3_REGION` | No | The AWS S3 region where the S3 storage plugin bucket is located. Note that `NC_S3_ENDPOINT` takes precedence if configured (the endpoint URL includes the region). | | | `NC_S3_ENDPOINT` | No | S3 endpoint for S3 storage plugin. | Defaults to `s3..amazonaws.com` | | `NC_S3_ACCESS_KEY` | No | The AWS access key ID required for the S3 storage plugin. | | | `NC_S3_ACCESS_SECRET` | No | The AWS access secret associated with the S3 storage plugin. | |