summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--newsdiff/settings/dokku.py7
-rw-r--r--requirements.txt1
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