1 files changed, 32 insertions, 21 deletions
diff --git a/src/lib/Server/Hostbase/urls.py b/src/lib/Server/Hostbase/urls.py
index 6ff12c631..67ff1a308 100644
--- a/src/lib/Server/Hostbase/urls.py
+++ b/src/lib/Server/Hostbase/urls.py
@@ -1,24 +1,35 @@
+import os
 from django.conf.urls.defaults import *
 
 urlpatterns = patterns('Hostbase.hostbase.views',
-    # Example:
-    # (r'^djangobase/', include('djangobase.apps.foo.urls.foo')),
-
-    # Uncomment this for admin:
-    (r'^admin/', include('django.contrib.admin.urls')),
-    (r'^hostbase/$', 'search'),
-    (r'^hostbase/(?P<host_id>\d+)/$', 'look'),
-    (r'^hostbase/(?P<host_id>\d+)/edit', 'edit'),
-    (r'^hostbase/(?P<host_id>\d+)/remove', 'remove'),
-    (r'^hostbase/(?P<host_id>\d+)/(?P<item>\D+)/(?P<item_id>\d+)/confirm', 'confirm'),
-    (r'^hostbase/(?P<host_id>\d+)/(?P<item>\D+)/(?P<item_id>\d+)/(?P<name_id>\d+)/confirm', 'confirm'),
-    (r'^hostbase/(?P<host_id>\d+)/dns/edit', 'dnsedit'),
-    (r'^hostbase/(?P<host_id>\d+)/dns', 'dns'),
-    (r'^hostbase/new', 'new'),
-    (r'^hostbase/hostinfo', 'hostinfo'),
-    (r'^hostbase/zones/$', 'zones'),
-    (r'^hostbase/zones/(?P<zone_id>\d+)/$', 'zoneview'),                       
-    (r'^hostbase/zones/(?P<zone_id>\d+)/edit', 'zoneedit'),
-    (r'^hostbase/zones/new/$', 'zonenew'),
-    (r'^hostbase/zones/(?P<zone_id>\d+)/(?P<item>\D+)/(?P<item_id>\d+)/confirm', 'confirm'),
-                       )
+                       
+                       (r'^admin/', include('django.contrib.admin.urls')),
+                       (r'^hostbase/$', 'search'),
+                       (r'^hostbase/(?P<host_id>\d+)/$', 'look'),
+                       (r'^hostbase/(?P<host_id>\d+)/edit', 'edit'),
+                       (r'^hostbase/(?P<host_id>\d+)/remove', 'remove'),
+                       (r'^hostbase/(?P<host_id>\d+)/(?P<item>\D+)/(?P<item_id>\d+)/confirm', 'confirm'),
+                       (r'^hostbase/(?P<host_id>\d+)/(?P<item>\D+)/(?P<item_id>\d+)/(?P<name_id>\d+)/confirm', 'confirm'),
+                       (r'^hostbase/(?P<host_id>\d+)/dns/edit', 'dnsedit'),
+                       (r'^hostbase/(?P<host_id>\d+)/dns', 'dns'),
+                       (r'^hostbase/new', 'new'),
+                       (r'^hostbase/hostinfo', 'hostinfo'),
+                       (r'^hostbase/zones/$', 'zones'),
+                       (r'^hostbase/zones/(?P<zone_id>\d+)/$', 'zoneview'),                       
+                       (r'^hostbase/zones/(?P<zone_id>\d+)/edit', 'zoneedit'),
+                       (r'^hostbase/zones/new/$', 'zonenew'),
+                       (r'^hostbase/zones/(?P<zone_id>\d+)/(?P<item>\D+)/(?P<item_id>\d+)/confirm', 'confirm'))
+                       #(r'^login/$', 'login'),
+#fixme: this is a temp. kludge to handle static serving of css, img, js etc...
+#a better solution is to use mod_python/apache directives for the static serving
+urlpatterns += patterns('',
+                        (r'^site_media/(.*)$',
+                         'django.views.static.serve',
+                         {'document_root': os.environ['bcfg_media_root'],
+                          'show_indexes': True}),
+                        )
+urlpatterns += patterns('',                        
+                        (r'^login/$', 'django.contrib.auth.views.login',
+                         {'template_name': 'login.html'}),
+                        )
+