diff --git a/README.md b/README.md index b03e334..38dc411 100644 --- a/README.md +++ b/README.md @@ -19,16 +19,19 @@ This is the codebase for the website, [Snipt.net](https://snipt.net/). 2. `heroku create` 3. `heroku addons:add heroku-postgresql:standard-0` 4. `heroku addons:add bonsai` -5. `heroku config:add DEBUG=False` -6. `heroku config:add INTERCOM_SECRET_KEY=` -7. `heroku config:add POSTMARK_API_KEY=` -8. `heroku config:add RAVEN_CONFIG_DSN=` -9. `heroku config:add SECRET_KEY=` -10. `heroku config:add STRIPE_SECRET_KEY=` -11. `heroku config:add USE_SSL=False` -12. `git push heroku` -13. `heroku run pip install --index-url https://code.stripe.com --upgrade stripe` -14. `heroku run python manage.py syncdb` -15. `heroku run python manage.py migrate` +5. `heroku config:add AWS_ACCESS_KEY_ID=` +6. `heroku config:add AWS_SECRET_ACCESS_KEY=` +7. `heroku config:add AWS_STORAGE_BUCKET_NAME=` +8. `heroku config:add DEBUG=False` +9. `heroku config:add INTERCOM_SECRET_KEY=` +10. `heroku config:add POSTMARK_API_KEY=` +11. `heroku config:add RAVEN_CONFIG_DSN=` +12. `heroku config:add SECRET_KEY=` +13. `heroku config:add STRIPE_SECRET_KEY=` +14. `heroku config:add USE_SSL=False` +15. `git push heroku` +16. `heroku run pip install --index-url https://code.stripe.com --upgrade stripe` +17. `heroku run python manage.py syncdb` +18. `heroku run python manage.py migrate` Any problems / questions / bugs, [create an issue](https://github.com/nicksergeant/snipt/issues). Thanks! :) diff --git a/requirements.txt b/requirements.txt index c94876b..e38a9c2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ argparse==1.2.1 biplist==0.6 -boto==2.16.0 +boto==2.33.0 defusedxml==0.4.1 Django==1.6 django-annoying==0.7.7 @@ -9,6 +9,7 @@ django-debug-toolbar==0.11.0 django-extensions==1.2.5 django-markdown-deux==1.0.4 django-pagination==1.0.7 +django-storages==1.1.8 django-taggit==0.10 django-tastypie==0.10.0 django-templatetag-sugar==0.1 diff --git a/settings.py b/settings.py index ff8858d..5683267 100644 --- a/settings.py +++ b/settings.py @@ -86,6 +86,14 @@ USE_I18N = True USE_L10N = True USE_TZ = True +if not DEBUG: + 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', '') + STATICFILES_STORAGE = 'storages.backends.s3boto.S3BotoStorage' + S3_URL = 'https://%s.s3.amazonaws.com/' % AWS_STORAGE_BUCKET_NAME + STATIC_URL = S3_URL + INSTALLED_APPS = ( 'gunicorn', 'raven.contrib.django.raven_compat', @@ -104,6 +112,7 @@ INSTALLED_APPS = ( 'postmark', 'registration', 'south', + 'storages', 'taggit', 'tastypie', 'typogrify',