decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

always serve static files, if behind nginx/apache those are not handed down

Browse source
This commit is contained in:
j 2011-11-03 13:02:12 +01:00
parent af2c26a36a
commit 0ed8c805c7
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pandora/settings.py
View file

@ -42,7 +42,6 @@ APPEND_SLASH = False
# Example: "/home/media/media.lawrence.com/" # Example: "/home/media/media.lawrence.com/"
MEDIA_ROOT = normpath(join(PROJECT_ROOT, '..', 'data')) MEDIA_ROOT = normpath(join(PROJECT_ROOT, '..', 'data'))
STATIC_ROOT = normpath(join(PROJECT_ROOT, '..', 'static')) STATIC_ROOT = normpath(join(PROJECT_ROOT, '..', 'static'))
TESTS_ROOT = join(PROJECT_ROOT, 'tests')
# URL that handles the media served from MEDIA_ROOT. Make sure to use a # URL that handles the media served from MEDIA_ROOT. Make sure to use a
# trailing slash if there is a path component (optional in other cases). # trailing slash if there is a path component (optional in other cases).

17
pandora/urls.py
View file

@ -30,15 +30,14 @@ urlpatterns = patterns('',
(r'^robots.txt$', serve_static_file, {'location': os.path.join(settings.STATIC_ROOT, 'robots.txt'), 'content_type': 'text/plain'}), (r'^robots.txt$', serve_static_file, {'location': os.path.join(settings.STATIC_ROOT, 'robots.txt'), 'content_type': 'text/plain'}),
(r'^favicon.ico$', serve_static_file, {'location': os.path.join(settings.STATIC_ROOT, 'png/icon.16.png'), 'content_type': 'image/x-icon'}), (r'^favicon.ico$', serve_static_file, {'location': os.path.join(settings.STATIC_ROOT, 'png/icon.16.png'), 'content_type': 'image/x-icon'}),
) )
if settings.DEBUG: #if settings.DEBUG:
urlpatterns += patterns('', #sould this not be enabled by default? nginx should handle those
(r'^data/(?P<path>.*)$', 'django.views.static.serve', urlpatterns += patterns('',
{'document_root': settings.MEDIA_ROOT}), (r'^data/(?P<path>.*)$', 'django.views.static.serve',
(r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}),
{'document_root': settings.STATIC_ROOT}), (r'^static/(?P<path>.*)$', 'django.views.static.serve',
(r'^tests/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_ROOT}),
{'document_root': settings.TESTS_ROOT}), )
)
urlpatterns += patterns('', urlpatterns += patterns('',
(r'^(V[a-z0-9]*)$', 'urlalias.views.padma_video'), (r'^(V[a-z0-9]*)$', 'urlalias.views.padma_video'),