diff options
| author | Andrew Godwin | 2022-12-14 21:21:18 -0700 |
|---|---|---|
| committer | Andrew Godwin | 2022-12-14 21:21:18 -0700 |
| commit | 16005e14ef46c6721f4bf4e01a54e6c1bf0ecdf7 (patch) | |
| tree | 60046a6b137e3b2602de6542070b6d8192bccb21 /takahe | |
| parent | 5d8b8212cc452a09b393d1024c832b464fe03740 (diff) | |
| download | takahe-16005e14ef46c6721f4bf4e01a54e6c1bf0ecdf7.tar.gz takahe-16005e14ef46c6721f4bf4e01a54e6c1bf0ecdf7.tar.bz2 takahe-16005e14ef46c6721f4bf4e01a54e6c1bf0ecdf7.zip | |
Make GCS backend handle webp right, and use gs://
Fixes #164
Diffstat (limited to 'takahe')
| -rw-r--r-- | takahe/settings.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/takahe/settings.py b/takahe/settings.py index 552dc76..ee3854c 100644 --- a/takahe/settings.py +++ b/takahe/settings.py @@ -338,15 +338,14 @@ if SETUP.EMAIL_SERVER: if SETUP.MEDIA_BACKEND: parsed = urllib.parse.urlparse(SETUP.MEDIA_BACKEND) query = urllib.parse.parse_qs(parsed.query) - if parsed.scheme == "gcs": - DEFAULT_FILE_STORAGE = "storages.backends.gcloud.GoogleCloudStorage" - if parsed.path.lstrip("/"): - GS_BUCKET_NAME = parsed.path.lstrip("/") - else: - GS_BUCKET_NAME = parsed.hostname + if parsed.scheme == "gs": + DEFAULT_FILE_STORAGE = "core.uploads.TakaheGoogleCloudStorage" + GS_BUCKET_NAME = parsed.path.lstrip("/") GS_QUERYSTRING_AUTH = False + if parsed.hostname is not None: + port = parsed.port or 443 + GS_CUSTOM_ENDPOINT = f"https://{parsed.hostname}:{port}" elif parsed.scheme == "s3": - # DEFAULT_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage" DEFAULT_FILE_STORAGE = "core.uploads.TakaheS3Storage" AWS_STORAGE_BUCKET_NAME = parsed.path.lstrip("/") AWS_QUERYSTRING_AUTH = False |