From 0159d2e7ab3768a0b721a3c1c66643e593fc72c5 Mon Sep 17 00:00:00 2001 From: dmorina Date: Wed, 18 May 2016 17:33:19 -0700 Subject: [PATCH] adds s3 file storage --- csp/settings.py | 8 ++++++++ local_settings_default.py | 2 ++ requirements.txt | 1 + 3 files changed, 11 insertions(+) diff --git a/csp/settings.py b/csp/settings.py index f1777d5a..85ffa712 100644 --- a/csp/settings.py +++ b/csp/settings.py @@ -238,6 +238,14 @@ MTURK_THRESHOLD = 0.61 POST_TO_MTURK = os.environ.get('POST_TO_MTURK', True) + +# AWS +DEFAULT_FILE_STORAGE = 'storages.backends.s3boto.S3BotoStorage' +AWS_ACCESS_KEY_ID = os.environ.get('AWS_ACCESS_KEY_ID', '') +AWS_SECRET_ACCESS_KEY = os.environ.get('AWS_SECRET_ACCESS_KEY', '') +AWS_STORAGE_BUCKET_NAME = os.environ.get('AWS_STORAGE_BUCKET_NAME', 'daemo') +AWS_S3_FILE_OVERWRITE = False + # Celery BROKER_URL = REDIS_URL CELERY_RESULT_BACKEND = REDIS_URL diff --git a/local_settings_default.py b/local_settings_default.py index 25b5486b..ce8e748e 100644 --- a/local_settings_default.py +++ b/local_settings_default.py @@ -19,3 +19,5 @@ } EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' + +DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage' diff --git a/requirements.txt b/requirements.txt index baa9e98c..b8421e34 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,6 +15,7 @@ djangorestframework==3.3.1 django-redis-sessions==0.5.0 dj-redis-url==0.1.4 dj-static==0.0.6 +django-storages-redux==1.3.2 django-toolbelt==0.0.1 django-websocket-redis==0.4.6 dropbox==3.23