fix up s3.

Author: markng

requirements.txt

@@ -2,6 +2,7 @@ Django==1.4.1
 Genshi==0.6
 dj-database-url==0.2.1
 django-extensions==0.9
+django-storages==1.1.5
 feedparser==5.1.2
 gevent==0.13.8
 greenlet==0.4.0

settings.py

@@ -78,8 +78,10 @@
     'join',
     'django_extensions',
     'gunicorn',
+    'storages',
 )
 
+
 GOOGLE_MAPS_API_KEYS = {
   'tolerance.markng.co.uk': 'ABQIAAAARLoA22nEYHR0NvOy5PhlABQCULP4XOMyhPd8d_NrQQEO8sT8XBRcnzN6opBIDWJu1LZNj_pwrPsp8A',
   'dotdorset.org': 'ABQIAAAARLoA22nEYHR0NvOy5PhlABRzb6WlbTpBFu4KRv6X5rYmMGQeVxTcZCqq-phTHsx_Nm7TzbnRRsEd_A',
@@ -89,3 +91,12 @@
     from localsettings import *
 except Exception, e:
     pass
+
+
+if not DEBUG:
+    STATICFILES_STORAGE = 'storages.backends.s3boto.S3BotoStorage'
+    DEFAULT_FILE_STORAGE = 'storages.backends.s3boto.S3BotoStorage'
+    AWS_ACCESS_KEY_ID = os.environ.get('AWS_ACCESS_KEY_ID', None)
+    AWS_SECRET_ACCESS_KEY = os.environ.get('AWS_SECRET_ACCESS_KEY', None)
+    AWS_STORAGE_BUCKET_NAME = os.environ.get('AWS_STORAGE_BUCKET_NAME', None)
+    STATIC_URL = 'http://du6kqsgpwn58q.cloudfront.net/'

urls.py

@@ -1,5 +1,6 @@
 from django.conf.urls.defaults import *
 from django.contrib import admin
+from django.conf import settings
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 from aggregator.feed import FullFeed, CategoryFeed
 feeds = {
@@ -12,7 +13,6 @@
     (r'^join/$', 'join.views.index'),
     (r'^admin/', include(admin.site.urls)),
     (r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}),
-    (r’^static/(?P.*)$’, ‘django.views.static.serve’, {‘document_root’: settings.STATIC_ROOT}), # we SHOULDN'T DO THIS, but I'm not paying for S3 storage for this, too. :)
 )
 
 urlpatterns += staticfiles_urlpatterns()