From 82b4bc904ba54f78975a1f72f1e1e45ba00177ef Mon Sep 17 00:00:00 2001 From: Ben Adida <ben@adida.net> Date: Tue, 4 May 2010 17:39:42 -0700 Subject: [PATCH] continued porting --- helios | 2 +- urls.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/helios b/helios index 8006892..dc79223 160000 --- a/helios +++ b/helios @@ -1 +1 @@ -Subproject commit 8006892dcb25be15a69210208bed027ba1280ed3 +Subproject commit dc7922317e63b9f7546ed21c923427eb865d09c2 diff --git a/urls.py b/urls.py index 206593d..c053d52 100644 --- a/urls.py +++ b/urls.py @@ -7,8 +7,10 @@ urlpatterns = patterns( '', (r'^auth/', include('auth.urls')), (r'^helios/', include('helios.urls')), - + # SHOULD BE REPLACED BY APACHE STATIC PATH + (r'booth/(?P<path>.*)$', 'django.views.static.serve', {'document_root' : settings.ROOT_PATH + '/heliosbooth'}), + (r'static/auth/(?P<path>.*)$', 'django.views.static.serve', {'document_root' : settings.ROOT_PATH + '/auth/media'}), (r'static/helios/(?P<path>.*)$', 'django.views.static.serve', {'document_root' : settings.ROOT_PATH + '/helios/media'}), (r'static/(?P<path>.*)$', 'django.views.static.serve', {'document_root' : settings.ROOT_PATH + '/server_ui/media'}), -- GitLab