فهرست منبع

Use Django 4.2+ syntax for storage

Jake Howard 2 ماه پیش
والد
کامیت
b4d9cf38cb
3فایلهای تغییر یافته به همراه15 افزوده شده و 4 حذف شده
  1. 1 1
      bakerydemo/base/management/commands/reset_demo.py
  2. 9 0
      bakerydemo/settings/base.py
  3. 5 3
      bakerydemo/settings/production.py

+ 1 - 1
bakerydemo/base/management/commands/reset_demo.py

@@ -17,7 +17,7 @@ class Command(BaseCommand):
             )
 
         # 1. (optional) Remove all objects from S3
-        if "s3" in settings.DEFAULT_FILE_STORAGE:
+        if "s3" in default_storage.__class__.__name__.lower():
             self.stdout.write("Removing files from S3")
             default_storage.bucket.objects.all().delete()
         else:

+ 9 - 0
bakerydemo/settings/base.py

@@ -182,6 +182,15 @@ STATIC_URL = "/static/"
 MEDIA_ROOT = os.path.join(PROJECT_DIR, "media")
 MEDIA_URL = "/media/"
 
+STORAGES = {
+    "default": {
+        "BACKEND": "django.core.files.storage.FileSystemStorage",
+    },
+    "staticfiles": {
+        "BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage",
+    },
+}
+
 # Override in local settings or replace with your own key. Please don't use our demo key in production!
 GOOGLE_MAP_API_KEY = "AIzaSyD31CT9P9KxvNUJOwDq2kcFEIG8ADgaFgw"
 

+ 5 - 3
bakerydemo/settings/production.py

@@ -141,13 +141,15 @@ if ELASTICSEARCH_ENDPOINT:
 # https://warehouse.python.org/project/whitenoise/
 
 MIDDLEWARE.append("whitenoise.middleware.WhiteNoiseMiddleware")
-STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
+STORAGES["staticfiles"][
+    "BACKEND"
+] = "whitenoise.storage.CompressedManifestStaticFilesStorage"
 
 if "AWS_STORAGE_BUCKET_NAME" in os.environ:
     AWS_STORAGE_BUCKET_NAME = os.getenv("AWS_STORAGE_BUCKET_NAME")
     AWS_QUERYSTRING_AUTH = False
     INSTALLED_APPS.append("storages")
-    DEFAULT_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
+    STORAGES["default"]["BACKEND"] = "storages.backends.s3boto3.S3Boto3Storage"
     AWS_S3_FILE_OVERWRITE = False
     AWS_DEFAULT_ACL = "private"
     if "AWS_S3_CUSTOM_DOMAIN" in os.environ:
@@ -162,7 +164,7 @@ if "GS_BUCKET_NAME" in os.environ:
     GS_AUTO_CREATE_BUCKET = True
 
     INSTALLED_APPS.append("storages")
-    DEFAULT_FILE_STORAGE = "storages.backends.gcloud.GoogleCloudStorage"
+    STORAGES["default"]["BACKEND"] = "storages.backends.gcloud.GoogleCloudStorage"
 
 LOGGING = {
     "version": 1,