From 4aa219c7756a66e4f2a11588e71cf4f1c56d8645 Mon Sep 17 00:00:00 2001 From: Wan Liuyang Date: Wed, 5 Sep 2018 15:11:13 +0800 Subject: [PATCH] Revert AWS_DEFAULT_ACL/AWS_BUCKET_ACL and update django-storages version --- docs/settings.rst | 2 -- {{cookiecutter.project_slug}}/config/settings/production.py | 4 ---- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/docs/settings.rst b/docs/settings.rst index 7cf465010..6e71a5151 100644 --- a/docs/settings.rst +++ b/docs/settings.rst @@ -44,8 +44,6 @@ Environment Variable Django Setting Development DJANGO_AWS_ACCESS_KEY_ID AWS_ACCESS_KEY_ID n/a raises error DJANGO_AWS_SECRET_ACCESS_KEY AWS_SECRET_ACCESS_KEY n/a raises error DJANGO_AWS_STORAGE_BUCKET_NAME AWS_STORAGE_BUCKET_NAME n/a raises error -DJANGO_AWS_DEFAULT_ACL AWS_DEFAULT_ACL n/a None -DJANGO_AWS_BUCKET_ACL AWS_BUCKET_ACL n/a None SENTRY_DSN SENTRY_DSN n/a raises error DJANGO_SENTRY_CLIENT SENTRY_CLIENT n/a raven.contrib.django.raven_compat.DjangoClient DJANGO_SENTRY_LOG_LEVEL SENTRY_LOG_LEVEL n/a logging.INFO diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index 1662124f6..509455ed8 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -73,10 +73,6 @@ AWS_SECRET_ACCESS_KEY = env('DJANGO_AWS_SECRET_ACCESS_KEY') # https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings AWS_STORAGE_BUCKET_NAME = env('DJANGO_AWS_STORAGE_BUCKET_NAME') # https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings -AWS_DEFAULT_ACL = env('DJANGO_AWS_DEFAULT_ACL', default=None) -# https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings -AWS_BUCKET_ACL = env('DJANGO_AWS_BUCKET_ACL', default=None) -# https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings AWS_QUERYSTRING_AUTH = False # DO NOT change these unless you know what you're doing. _AWS_EXPIRY = 60 * 60 * 24 * 7 diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 21fe5bc4e..8a58890ec 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -13,5 +13,5 @@ raven==6.9.0 # https://github.com/getsentry/raven-python # Django # ------------------------------------------------------------------------------ -django-storages[boto3]==1.6.6 # https://github.com/jschneier/django-storages +django-storages[boto3]==1.7 # https://github.com/jschneier/django-storages django-anymail[mailgun]==4.1 # https://github.com/anymail/django-anymail