From 7c6c413d96ff1ab11344f95eb75efa050416b8b2 Mon Sep 17 00:00:00 2001 From: Oliver Marks Date: Tue, 18 Sep 2018 21:09:44 +0100 Subject: [PATCH] Rename for stage and production --- config/settings/production.py | 33 +++++++++++++++------------------ config/settings/stage.py | 29 +++++++++++------------------ 2 files changed, 26 insertions(+), 36 deletions(-) diff --git a/config/settings/production.py b/config/settings/production.py index 56c1f47..2691a0c 100644 --- a/config/settings/production.py +++ b/config/settings/production.py @@ -41,22 +41,6 @@ ALLOWED_HOSTS.append('172.18.0.5') # END SITE CONFIGURATION -AWS_ACCESS_KEY_ID = env('DJANGO_AWS_ACCESS_KEY_ID') -AWS_SECRET_ACCESS_KEY = env('DJANGO_AWS_SECRET_ACCESS_KEY') -AWS_STORAGE_BUCKET_NAME = env('DJANGO_AWS_STORAGE_BUCKET_NAME') -AWS_AUTO_CREATE_BUCKET = True -AWS_QUERYSTRING_AUTH = False - -# AWS cache settings, don't change unless you know what you're doing: -AWS_EXPIRY = 60 * 60 * 24 * 7 - -# TODO See: https://github.com/jschneier/django-storages/issues/47 -# Revert the following and use str after the above-mentioned bug is fixed in -# either django-storage-redux or boto -AWS_HEADERS = { - 'Cache-Control': six.b('max-age=%d, s-maxage=%d, must-revalidate' % ( - AWS_EXPIRY, AWS_EXPIRY)) -} # EMAIL # ------------------------------------------------------------------------------ @@ -182,10 +166,23 @@ LOGGING = { PAYMENT_PROVIDERS['gocardless']['redirect_url'] = 'https://maidstone-hackspace.org.uk' +AWS_AUTO_CREATE_BUCKET = True +AWS_QUERYSTRING_AUTH = False + +# AWS cache settings, don't change unless you know what you're doing: +AWS_EXPIRY = 60 * 60 * 24 * 7 + +# TODO See: https://github.com/jschneier/django-storages/issues/47 +# Revert the following and use str after the above-mentioned bug is fixed in +# either django-storage-redux or boto +AWS_HEADERS = { + 'Cache-Control': six.b('max-age=%d, s-maxage=%d, must-revalidate' % ( + AWS_EXPIRY, AWS_EXPIRY)) +} AWS_S3_SECURE_URLS = True -AWS_ACCESS_KEY_ID = env('DIGITALOCEAN_SPACE_KEY') -AWS_SECRET_ACCESS_KEY = env('DIGITALOCEAN_SPACE_SECRET') +AWS_ACCESS_KEY_ID = env('BUCKET_KEY') +AWS_SECRET_ACCESS_KEY = env('BUCKET_SPACE_SECRET_KEY') AWS_STORAGE_BUCKET_NAME = 'mhackspace' AWS_S3_ENDPOINT_URL = 'https://ams3.digitaloceanspaces.com' AWS_S3_OBJECT_PARAMETERS = { diff --git a/config/settings/stage.py b/config/settings/stage.py index 3ceb0c6..d80c219 100644 --- a/config/settings/stage.py +++ b/config/settings/stage.py @@ -39,22 +39,6 @@ ALLOWED_HOSTS.append('172.18.0.5') -AWS_ACCESS_KEY_ID = env('DJANGO_AWS_ACCESS_KEY_ID') -AWS_SECRET_ACCESS_KEY = env('DJANGO_AWS_SECRET_ACCESS_KEY') -AWS_STORAGE_BUCKET_NAME = env('DJANGO_AWS_STORAGE_BUCKET_NAME') -AWS_AUTO_CREATE_BUCKET = True -AWS_QUERYSTRING_AUTH = False - -# AWS cache settings, don't change unless you know what you're doing: -AWS_EXPIRY = 60 * 60 * 24 * 7 - -# TODO See: https://github.com/jschneier/django-storages/issues/47 -# Revert the following and use str after the above-mentioned bug is fixed in -# either django-storage-redux or boto -AWS_HEADERS = { - 'Cache-Control': six.b('max-age=%d, s-maxage=%d, must-revalidate' % ( - AWS_EXPIRY, AWS_EXPIRY)) -} # EMAIL # ------------------------------------------------------------------------------ DEFAULT_FROM_EMAIL = env('DJANGO_DEFAULT_FROM_EMAIL', @@ -157,10 +141,19 @@ LOGGING = { PAYMENT_PROVIDERS['gocardless']['redirect_url'] = 'https://test.maidstone-hackspace.org.uk' +AWS_AUTO_CREATE_BUCKET = True +AWS_QUERYSTRING_AUTH = False + +# AWS cache settings, don't change unless you know what you're doing: +AWS_EXPIRY = 60 * 60 * 24 * 7 +AWS_HEADERS = { + 'Cache-Control': six.b('max-age=%d, s-maxage=%d, must-revalidate' % ( + AWS_EXPIRY, AWS_EXPIRY)) +} AWS_S3_SECURE_URLS = True -AWS_ACCESS_KEY_ID = env('DIGITALOCEAN_SPACE_KEY') -AWS_SECRET_ACCESS_KEY = env('DIGITALOCEAN_SPACE_SECRET') +AWS_ACCESS_KEY_ID = env('BUCKET_KEY') +AWS_SECRET_ACCESS_KEY = env('BUCKET_SPACE_SECRET_KEY') AWS_STORAGE_BUCKET_NAME = 'mhackspace' AWS_S3_ENDPOINT_URL = 'https://ams3.digitaloceanspaces.com' AWS_S3_OBJECT_PARAMETERS = {