From cac3cdccc1ace64b752ab196c3b7ef464da25b3e Mon Sep 17 00:00:00 2001 From: Nick Sergeant Date: Sun, 26 Feb 2012 19:57:52 -0500 Subject: [PATCH] Herouk --- snipt/settings.py | 1 + snipt/urls.py | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/snipt/settings.py b/snipt/settings.py index 3213c8c..9b1940d 100644 --- a/snipt/settings.py +++ b/snipt/settings.py @@ -69,6 +69,7 @@ if DEBUG: STATIC_URL = '/media/' else: STATIC_URL = 'https://snipt.s3.amazonaws.com/' +HEROKU_STATIC_URL = '/media/' # S3 Settings AWS_ACCESS_KEY_ID = 'AKIAJTFDHBCXHJLXINKQ' diff --git a/snipt/urls.py b/snipt/urls.py index 16fe7df..f18d270 100644 --- a/snipt/urls.py +++ b/snipt/urls.py @@ -22,6 +22,11 @@ private_api.register(PrivateTagResource()) private_api.register(PrivateUserResource()) urlpatterns = patterns('', + + url(r'^media/(?P.*)$', 'django.views.static.serve', { + 'document_root': settings.HEROKU_STATIC_URL, + }), + url(r'^admin/', include(admin.site.urls)), url(r'^grappelli/', include('grappelli.urls')), @@ -43,9 +48,5 @@ urlpatterns = patterns('', name='registration_register'), url(r'', include('registration.backends.default.urls')), - url(r'^media/(?P.*)$', 'django.views.static.serve', { - 'document_root': settings.MEDIA_ROOT, - }), - url(r'^', include('snipts.urls')), )