diff --git a/.gitignore b/.gitignore index 6b2f6ca..8340c6f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ staticfiles/* cache/ celerybeat-schedule celerybeat.pid +.minio.sys \ No newline at end of file diff --git a/config/settings/local.py b/config/settings/local.py index ea2fe25..63dfecf 100644 --- a/config/settings/local.py +++ b/config/settings/local.py @@ -17,6 +17,7 @@ from .common import * # noqa # DEBUG # ------------------------------------------------------------------------------ DEBUG = env.bool('DJANGO_DEBUG', default=True) +DEBUG = False TEMPLATES[0]['OPTIONS']['debug'] = DEBUG # SECRET CONFIGURATION @@ -148,26 +149,17 @@ LOGGING = { PAYMENT_PROVIDERS['gocardless']['redirect_url'] = 'http://127.0.0.1:8180' TEMPLATE_DEBUG = False - AWS_S3_SECURE_URLS = False AWS_ACCESS_KEY_ID = env('MINIO_ACCESS_KEY') AWS_SECRET_ACCESS_KEY = env('MINIO_SECRET_KEY') - AWS_S3_ENDPOINT_URL = 'http://%s:9000' % socket.gethostbyname('bucket') - - -# AWS_S3_SECURE_URLS = True -# AWS_ACCESS_KEY_ID = env('DIGITALOCEAN_SPACE_KEY') -# AWS_SECRET_ACCESS_KEY = env('DIGITALOCEAN_SPACE_SECRET') -# AWS_S3_ENDPOINT_URL = 'https://ams3.digitaloceanspaces.com' -AWS_STORAGE_BUCKET_NAME = 'mhackspace' +AWS_STORAGE_BUCKET_NAME = 'static' AWS_S3_OBJECT_PARAMETERS = { 'CacheControl': 'max-age=86400', } -AWS_LOCATION = 'dev' AWS_S3_SECURE_URLS = True -STATIC_URL = '%s/%s/%s/' % (AWS_S3_ENDPOINT_URL, AWS_STORAGE_BUCKET_NAME, AWS_LOCATION) +STATIC_URL = '%s/%s/' % (AWS_S3_ENDPOINT_URL, AWS_STORAGE_BUCKET_NAME) STATICFILES_STORAGE = 'storages.backends.s3boto3.S3Boto3Storage' -COMPRESS_URL = '%s/%s/%s/' % (AWS_S3_ENDPOINT_URL, AWS_STORAGE_BUCKET_NAME, AWS_LOCATION) +COMPRESS_URL = '%s/%s/' % (AWS_S3_ENDPOINT_URL, AWS_STORAGE_BUCKET_NAME) diff --git a/config/settings/production.py b/config/settings/production.py index ec13148..bdd07ed 100644 --- a/config/settings/production.py +++ b/config/settings/production.py @@ -222,3 +222,18 @@ ADMIN_URL = env('DJANGO_ADMIN_URL', default='trustee') PAYMENT_PROVIDERS['gocardless']['redirect_url'] = 'https://maidstone-hackspace.org.uk' + +AWS_S3_SECURE_URLS = True +AWS_ACCESS_KEY_ID = env('DIGITALOCEAN_SPACE_KEY') +AWS_SECRET_ACCESS_KEY = env('DIGITALOCEAN_SPACE_SECRET') +AWS_STORAGE_BUCKET_NAME = 'mhackspace' +AWS_S3_ENDPOINT_URL = 'https://ams3.digitaloceanspaces.com' +AWS_S3_OBJECT_PARAMETERS = { + 'CacheControl': 'max-age=86400', +} +AWS_LOCATION = 'static' + +STATIC_URL = '%s/%s/%s/' % (AWS_S3_ENDPOINT_URL, AWS_STORAGE_BUCKET_NAME, AWS_LOCATION) +STATICFILES_STORAGE = 'storages.backends.s3boto3.S3Boto3Storage' + +COMPRESS_URL = STATIC_URL diff --git a/dev.yml b/dev.yml index 4559ce9..e250435 100644 --- a/dev.yml +++ b/dev.yml @@ -64,5 +64,5 @@ services: image: minio/minio env_file: .env volumes: - - ./buckets:/data + - ./mhackspace:/data command: server /data