diff options
| author | Yuval Adam <yuv.adm@gmail.com> | 2013-12-31 17:21:35 +0200 |
|---|---|---|
| committer | Yuval Adam <yuv.adm@gmail.com> | 2013-12-31 17:21:35 +0200 |
| commit | f3a7cfaca644c59eec450fa04f67b6575d82b10b (patch) | |
| tree | 5d4c24e1fe17ec02ced252610025a3ec1fa35f29 | |
| parent | 041b23b9e3182f6b2902dc463a897305f024ff86 (diff) | |
S3 stuff
| -rw-r--r-- | newsdiff/settings/dokku.py | 7 | ||||
| -rw-r--r-- | requirements.txt | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/newsdiff/settings/dokku.py b/newsdiff/settings/dokku.py index f4783d3..80fbd71 100644 --- a/newsdiff/settings/dokku.py +++ b/newsdiff/settings/dokku.py @@ -1,6 +1,7 @@ import dj_database_url from os import environ +from S3 import CallingFormat from .base import * ENV = 'dokku' @@ -13,4 +14,8 @@ DATABASES = { 'default': dj_database_url.config() } -DEFAULT_FILE_STORAGE = 'storages.backends.s3boto.S3BotoStorage' +STATICFILES_STORAGE = DEFAULT_FILE_STORAGE = 'storages.backends.s3boto.S3BotoStorage' +AWS_ACCESS_KEY_ID = environ.get('AWS_ACCESS_KEY') +AWS_SECRET_ACCESS_KEY = environ.get('AWS_SECRET_KEY') +AWS_STORAGE_BUCKET_NAME = environ.get('AWS_STORAGE_BUCKET_NAME') +AWS_CALLING_FORMAT = CallingFormat.SUBDOMAIN diff --git a/requirements.txt b/requirements.txt index 620a55b..0dc7d61 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,6 +6,7 @@ amqp==1.3.3 anyjson==0.3.3 beautifulsoup4==4.3.2 billiard==3.3.0.11 +boto==2.21.2 celery==3.1.6 dj-database-url==0.2.2 django-nose==1.2 |