master
Nick Sergeant 2012-02-26 19:57:52 -05:00
parent 529ed824e8
commit cac3cdccc1
2 changed files with 6 additions and 4 deletions

View File

@ -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'

View File

@ -22,6 +22,11 @@ private_api.register(PrivateTagResource())
private_api.register(PrivateUserResource())
urlpatterns = patterns('',
url(r'^media/(?P<path>.*)$', '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<path>.*)$', 'django.views.static.serve', {
'document_root': settings.MEDIA_ROOT,
}),
url(r'^', include('snipts.urls')),
)