Skip to content
Snippets Groups Projects
Commit 90379f76 authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Merge branch '576-error-uploading-favicon-to-s3' into 'master'

Resolve "Error uploading favicon to S3"

Closes #576

See merge request AlekSIS/official/AlekSIS-Core!829
parents ee119980 ebd20d94
No related branches found
No related tags found
No related merge requests found
...@@ -9,6 +9,11 @@ and this project adheres to `Semantic Versioning`_. ...@@ -9,6 +9,11 @@ and this project adheres to `Semantic Versioning`_.
Unreleased Unreleased
---------- ----------
Fixed
~~~~~
* Small files could fail to upload to S3 storage due to MemoryFileUploadHandler
`2.3`_ – 2021-12-15 `2.3`_ – 2021-12-15
------------------- -------------------
......
...@@ -862,10 +862,16 @@ PROMETHEUS_METRICS_EXPORT_ADDRESS = _settings.get("prometheus.metrucs.address", ...@@ -862,10 +862,16 @@ PROMETHEUS_METRICS_EXPORT_ADDRESS = _settings.get("prometheus.metrucs.address",
SECURE_PROXY_SSL_HEADER = ("REQUEST_SCHEME", "https") SECURE_PROXY_SSL_HEADER = ("REQUEST_SCHEME", "https")
FILE_UPLOAD_HANDLERS = [
"django.core.files.uploadhandler.MemoryFileUploadHandler",
"django.core.files.uploadhandler.TemporaryFileUploadHandler",
]
if _settings.get("storage.type", "").lower() == "s3": if _settings.get("storage.type", "").lower() == "s3":
INSTALLED_APPS.append("storages") INSTALLED_APPS.append("storages")
DEFAULT_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage" DEFAULT_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
FILE_UPLOAD_HANDLERS.remove("django.core.files.uploadhandler.MemoryFileUploadHandler")
if _settings.get("storage.s3.static.enabled", False): if _settings.get("storage.s3.static.enabled", False):
STATICFILES_STORAGE = "storages.backends.s3boto3.S3StaticStorage" STATICFILES_STORAGE = "storages.backends.s3boto3.S3StaticStorage"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment