From 5ee278a949484b92d71955dcbcf709ebf7ae8faa Mon Sep 17 00:00:00 2001
From: Ben Adida <ben@adida.net>
Date: Sun, 2 May 2010 21:33:23 -0700
Subject: [PATCH] continuing updates for port to pure django
---
auth | 2 +-
helios | 2 +-
urls.py | 13 +++++++++++--
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/auth b/auth
index 8a5f879..d533f09 160000
--- a/auth
+++ b/auth
@@ -1 +1 @@
-Subproject commit 8a5f879af1f5532841e2289970e976139e9f0d56
+Subproject commit d533f0923d3495a8d8507bbff2e4b3a8062548b9
diff --git a/helios b/helios
index 4acfe71..0507b4e 160000
--- a/helios
+++ b/helios
@@ -1 +1 @@
-Subproject commit 4acfe710ddb818a935a932f5d8361f35eb4d08de
+Subproject commit 0507b4e9df82a271476bae7a66ca4e5e59f0ca0e
diff --git a/urls.py b/urls.py
index 8fd7a71..206593d 100644
--- a/urls.py
+++ b/urls.py
@@ -1,9 +1,18 @@
# -*- coding: utf-8 -*-
from django.conf.urls.defaults import *
from django.contrib import admin
+from django.conf import settings
-urlpatterns = patterns('',
+urlpatterns = patterns(
+ '',
(r'^auth/', include('auth.urls')),
(r'^helios/', include('helios.urls')),
+
+ # SHOULD BE REPLACED BY APACHE STATIC PATH
+ (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'}),
+
(r'^', include('server_ui.urls')),
-)
\ No newline at end of file
+
+ )
--
GitLab