From 8eb87327df06a45a11ee0bcdb648c2acd30a8eb1 Mon Sep 17 00:00:00 2001 From: Daniel Egger Date: Tue, 30 May 2023 11:41:42 +0200 Subject: [PATCH] Remove references to `IT_USE_AZURE_BLOB_STORAGE` --- env_secrets/production_azure.env | Bin 5220 -> 4834 bytes server/backend/__init__.py | 0 server/backend/custom_azure.py | 21 --------------------- server/config/settings/base.py | 14 -------------- 4 files changed, 35 deletions(-) delete mode 100644 server/backend/__init__.py delete mode 100644 server/backend/custom_azure.py diff --git a/env_secrets/production_azure.env b/env_secrets/production_azure.env index e0c09b6b2b44cc114712a2ae1b4a4a056918d20e..b5149493afdd6d3d654f797aa3aba05059bb44f2 100644 GIT binary patch literal 4834 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 IT8&kxmntDjfB*mh literal 5220 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 diff --git a/server/backend/__init__.py b/server/backend/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/server/backend/custom_azure.py b/server/backend/custom_azure.py deleted file mode 100644 index d84ec148..00000000 --- a/server/backend/custom_azure.py +++ /dev/null @@ -1,21 +0,0 @@ -from environs import Env -from storages.backends.azure_storage import AzureStorage - -env = Env() -env.read_env() - - -class AzureMediaStorage(AzureStorage): - if env("IT_USE_AZURE_BLOB_STORAGE", False): - account_name = env("IT_AZURE_STORAGE_ACCOUNT") - account_key = env("IT_AZURE_STORAGE_KEY") - azure_container = "media" - expiration_secs = None - - -class AzureStaticStorage(AzureStorage): - if env("IT_USE_AZURE_BLOB_STORAGE", False): - account_name = env("IT_AZURE_STORAGE_ACCOUNT") - account_key = env("IT_AZURE_STORAGE_KEY") - azure_container = "static" - expiration_secs = None diff --git a/server/config/settings/base.py b/server/config/settings/base.py index d655b3c8..06b57573 100644 --- a/server/config/settings/base.py +++ b/server/config/settings/base.py @@ -214,20 +214,6 @@ if USE_AWS: # https://wagtail.org/blog/amazon-s3-for-media-files/ MEDIA_URL = "https://%s/" % AWS_S3_CUSTOM_DOMAIN DEFAULT_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage" -elif env("IT_USE_AZURE_BLOB_STORAGE", False): - # https://medium.com/@DawlysD/django-using-azure-blob-storage-to-handle-static-media-assets-from-scratch-90cbbc7d56be - DEFAULT_FILE_STORAGE = "backend.custom_azure.AzureMediaStorage" - # STATICFILES_STORAGE = 'backend.custom_azure.AzureStaticStorage' - - # STATIC_LOCATION = "static" - MEDIA_LOCATION = "media" - - AZURE_ACCOUNT_NAME = env("IT_AZURE_STORAGE_ACCOUNT") - AZURE_CUSTOM_DOMAIN = f"{AZURE_ACCOUNT_NAME}.blob.core.windows.net" - # STATIC_URL = f'https://{AZURE_CUSTOM_DOMAIN}/{APP_ENVIRONMENT}/{STATIC_LOCATION}/' - MEDIA_URL = f"https://{AZURE_CUSTOM_DOMAIN}/{APP_ENVIRONMENT}/{MEDIA_LOCATION}/" - - else: MEDIA_URL = "/server/media/"