From 9887d24949120d142a50320439c31e992f92cb49 Mon Sep 17 00:00:00 2001 From: Manan Bhavsar Date: Thu, 13 Jul 2023 10:50:39 -0400 Subject: [PATCH 1/3] removed overriding and if block in variable --- .../config/settings/production.py | 68 +++++++++---------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index 3a9cb10c5..498d30b12 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -62,8 +62,6 @@ SECURE_HSTS_PRELOAD = env.bool("DJANGO_SECURE_HSTS_PRELOAD", default=True) # https://docs.djangoproject.com/en/dev/ref/middleware/#x-content-type-options-nosniff SECURE_CONTENT_TYPE_NOSNIFF = env.bool("DJANGO_SECURE_CONTENT_TYPE_NOSNIFF", default=True) -STORAGES = dict() - {% if cookiecutter.cloud_provider != 'None' -%} # STORAGES # ------------------------------------------------------------------------------ @@ -105,49 +103,51 @@ AZURE_CONTAINER = env("DJANGO_AZURE_CONTAINER_NAME") {% endif -%} {% if cookiecutter.cloud_provider != 'None' or cookiecutter.use_whitenoise == 'y' -%} -# STATIC +# STATIC & MEDIA # ------------------------ -{% endif -%} -{% if cookiecutter.use_whitenoise == 'y' -%} -STORAGES["staticfiles"] = { - "BACKEND": "whitenoise.storage.CompressedManifestStaticFilesStorage", +STORAGES = { +{%- if cookiecutter.use_whitenoise == 'y' -%} + "staticfiles": { + "BACKEND": "whitenoise.storage.CompressedManifestStaticFilesStorage", + } +{%- elif cookiecutter.cloud_provider == 'AWS' -%} + "default": { + "BACKEND": "{{cookiecutter.project_slug}}.utils.storages.MediaRootS3Boto3Storage", + }, + "staticfiles": { + "BACKEND": "{{cookiecutter.project_slug}}.utils.storages.StaticRootS3Boto3Storage", + } +{%- elif cookiecutter.cloud_provider == 'GCP' -%} + "default": { + "BACKEND": "{{cookiecutter.project_slug}}.utils.storages.MediaRootGoogleCloudStorage", + }, + "staticfiles": { + "BACKEND": "{{cookiecutter.project_slug}}.utils.storages.StaticRootGoogleCloudStorage", + } +{%- elif cookiecutter.cloud_provider == 'Azure' -%} + "default": { + "BACKEND": "{{cookiecutter.project_slug}}.utils.storages.MediaRootAzureStorage", + }, + "staticfiles": { + "BACKEND": "{{cookiecutter.project_slug}}.utils.storages.StaticRootAzureStorage", + } +{%- endif -%} } -{% elif cookiecutter.cloud_provider == 'AWS' -%} -STORAGES["staticfiles"] = { - "BACKEND": "{{cookiecutter.project_slug}}.utils.storages.StaticRootS3Boto3Storage", -} -COLLECTFAST_STRATEGY = "collectfast.strategies.boto3.Boto3Strategy" -STATIC_URL = f"https://{aws_s3_domain}/static/" -{% elif cookiecutter.cloud_provider == 'GCP' -%} -STORAGES["staticfiles"] = { - "BACKEND": "{{cookiecutter.project_slug}}.utils.storages.StaticRootGoogleCloudStorage", -} -COLLECTFAST_STRATEGY = "collectfast.strategies.gcloud.GoogleCloudStrategy" -STATIC_URL = f"https://storage.googleapis.com/{GS_BUCKET_NAME}/static/" -{% elif cookiecutter.cloud_provider == 'Azure' -%} -STORAGES["staticfiles"] = { - "BACKEND": "{{cookiecutter.project_slug}}.utils.storages.StaticRootAzureStorage", -} -STATIC_URL = f"https://{AZURE_ACCOUNT_NAME}.blob.core.windows.net/static/" {% endif -%} -# MEDIA +# MEDIA_URL, STATIC_URL & COLLECTFAST_STRATEGY # ------------------------------------------------------------------------------ {%- if cookiecutter.cloud_provider == 'AWS' %} -STORAGES["default"] = { - "BACKEND": "{{cookiecutter.project_slug}}.utils.storages.MediaRootS3Boto3Storage", -} MEDIA_URL = f"https://{aws_s3_domain}/media/" +COLLECTFAST_STRATEGY = "collectfast.strategies.boto3.Boto3Strategy" +STATIC_URL = f"https://{aws_s3_domain}/static/" {%- elif cookiecutter.cloud_provider == 'GCP' %} -STORAGES["default"] = { - "BACKEND": "{{cookiecutter.project_slug}}.utils.storages.MediaRootGoogleCloudStorage", -} MEDIA_URL = f"https://storage.googleapis.com/{GS_BUCKET_NAME}/media/" +COLLECTFAST_STRATEGY = "collectfast.strategies.gcloud.GoogleCloudStrategy" +STATIC_URL = f"https://storage.googleapis.com/{GS_BUCKET_NAME}/static/" {%- elif cookiecutter.cloud_provider == 'Azure' %} -STORAGES["default"] = { - "BACKEND": "{{cookiecutter.project_slug}}.utils.storages.MediaRootAzureStorage", -} MEDIA_URL = f"https://{AZURE_ACCOUNT_NAME}.blob.core.windows.net/media/" +STATIC_URL = f"https://{AZURE_ACCOUNT_NAME}.blob.core.windows.net/static/" {%- endif %} # EMAIL From 8be900260bcebf8733fa40e5055b5645eee1b7c2 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Fri, 14 Jul 2023 20:11:54 +0100 Subject: [PATCH 2/3] Fix code style --- .../config/settings/production.py | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index 498d30b12..250379c7c 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -106,34 +106,34 @@ AZURE_CONTAINER = env("DJANGO_AZURE_CONTAINER_NAME") # STATIC & MEDIA # ------------------------ STORAGES = { -{%- if cookiecutter.use_whitenoise == 'y' -%} +{%- if cookiecutter.use_whitenoise == 'y' %} "staticfiles": { "BACKEND": "whitenoise.storage.CompressedManifestStaticFilesStorage", - } -{%- elif cookiecutter.cloud_provider == 'AWS' -%} + }, +{%- elif cookiecutter.cloud_provider == 'AWS' %} "default": { "BACKEND": "{{cookiecutter.project_slug}}.utils.storages.MediaRootS3Boto3Storage", }, "staticfiles": { "BACKEND": "{{cookiecutter.project_slug}}.utils.storages.StaticRootS3Boto3Storage", - } -{%- elif cookiecutter.cloud_provider == 'GCP' -%} + }, +{%- elif cookiecutter.cloud_provider == 'GCP' %} "default": { "BACKEND": "{{cookiecutter.project_slug}}.utils.storages.MediaRootGoogleCloudStorage", }, "staticfiles": { "BACKEND": "{{cookiecutter.project_slug}}.utils.storages.StaticRootGoogleCloudStorage", - } -{%- elif cookiecutter.cloud_provider == 'Azure' -%} + }, +{%- elif cookiecutter.cloud_provider == 'Azure' %} "default": { "BACKEND": "{{cookiecutter.project_slug}}.utils.storages.MediaRootAzureStorage", }, "staticfiles": { "BACKEND": "{{cookiecutter.project_slug}}.utils.storages.StaticRootAzureStorage", - } -{%- endif -%} + }, +{%- endif %} } -{% endif -%} +{%- endif %} # MEDIA_URL, STATIC_URL & COLLECTFAST_STRATEGY # ------------------------------------------------------------------------------ From ee655c3013d7163b23333480f9d50647a9204a0d Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Fri, 14 Jul 2023 20:12:45 +0100 Subject: [PATCH 3/3] Remove comment --- {{cookiecutter.project_slug}}/config/settings/production.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index 250379c7c..110cf8486 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -135,8 +135,6 @@ STORAGES = { } {%- endif %} -# MEDIA_URL, STATIC_URL & COLLECTFAST_STRATEGY -# ------------------------------------------------------------------------------ {%- if cookiecutter.cloud_provider == 'AWS' %} MEDIA_URL = f"https://{aws_s3_domain}/media/" COLLECTFAST_STRATEGY = "collectfast.strategies.boto3.Boto3Strategy"