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

Merge branch 'fix-storage-backend' into 'master'

Fix name of storage backend

See merge request !1423
parents 32cb3abd b0d3f708
No related branches found
No related tags found
1 merge request!1423Fix name of storage backend
Pipeline #172646 failed
...@@ -723,7 +723,7 @@ DBBACKUP_CONNECTOR_MAPPING = { ...@@ -723,7 +723,7 @@ DBBACKUP_CONNECTOR_MAPPING = {
} }
if _settings.get("backup.storage.type", "").lower() == "s3": if _settings.get("backup.storage.type", "").lower() == "s3":
DBBACKUP_STORAGE = "storages.backends.s3.S3Boto3Storage" DBBACKUP_STORAGE = "storages.backends.s3.S3Storage"
DBBACKUP_STORAGE_OPTIONS = { DBBACKUP_STORAGE_OPTIONS = {
key: value for (key, value) in _settings.get("backup.storage.s3").items() key: value for (key, value) in _settings.get("backup.storage.s3").items()
...@@ -1005,7 +1005,7 @@ FILE_UPLOAD_HANDLERS = [ ...@@ -1005,7 +1005,7 @@ FILE_UPLOAD_HANDLERS = [
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.s3.S3Boto3Storage" DEFAULT_FILE_STORAGE = "storages.backends.s3.S3Storage"
FILE_UPLOAD_HANDLERS.remove("django.core.files.uploadhandler.MemoryFileUploadHandler") 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):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment