Skip to content

Commit 87de913

Browse files
[WEB - 1482] fix: uploads when using block storages other than s3 and minio (#4647)
* fix: minio storage and redirection * dev: disconnect web url and app base url configuration.
1 parent b016e1d commit 87de913

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

apiserver/plane/settings/common.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,9 @@
225225
EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
226226

227227
# Storage Settings
228+
# Use Minio settings
229+
USE_MINIO = int(os.environ.get("USE_MINIO", 0)) == 1
230+
228231
STORAGES = {
229232
"staticfiles": {
230233
"BACKEND": "whitenoise.storage.CompressedManifestStaticFilesStorage",
@@ -243,7 +246,7 @@
243246
AWS_S3_ENDPOINT_URL = os.environ.get(
244247
"AWS_S3_ENDPOINT_URL", None
245248
) or os.environ.get("MINIO_ENDPOINT_URL", None)
246-
if AWS_S3_ENDPOINT_URL:
249+
if AWS_S3_ENDPOINT_URL and USE_MINIO:
247250
parsed_url = urlparse(os.environ.get("WEB_URL", "http://localhost"))
248251
AWS_S3_CUSTOM_DOMAIN = f"{parsed_url.netloc}/{AWS_STORAGE_BUCKET_NAME}"
249252
AWS_S3_URL_PROTOCOL = f"{parsed_url.scheme}:"
@@ -307,8 +310,6 @@
307310
ANALYTICS_SECRET_KEY = os.environ.get("ANALYTICS_SECRET_KEY", False)
308311
ANALYTICS_BASE_API = os.environ.get("ANALYTICS_BASE_API", False)
309312

310-
# Use Minio settings
311-
USE_MINIO = int(os.environ.get("USE_MINIO", 0)) == 1
312313

313314
# Posthog settings
314315
POSTHOG_API_KEY = os.environ.get("POSTHOG_API_KEY", False)
@@ -350,4 +351,4 @@
350351
# Base URLs
351352
ADMIN_BASE_URL = os.environ.get("ADMIN_BASE_URL", None)
352353
SPACE_BASE_URL = os.environ.get("SPACE_BASE_URL", None)
353-
APP_BASE_URL = os.environ.get("APP_BASE_URL") or os.environ.get("WEB_URL")
354+
APP_BASE_URL = os.environ.get("APP_BASE_URL")

0 commit comments

Comments
 (0)