tweaks for a more standard installation

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2554 ce84e21b-d406-0410-9b95-82705330c041

1 files changed, 1 insertions, 11 deletions

diff --git a/src/lib/Server/Hostbase/urls.py b/src/lib/Server/Hostbase/urls.py
index e4ed42996..fe76ae7b2 100644
--- a/src/lib/Server/Hostbase/urls.py
+++ b/src/lib/Server/Hostbase/urls.py
@@ -1,7 +1,7 @@
 import os
 from django.conf.urls.defaults import *
 
-urlpatterns = patterns('Hostbase.hostbase.views',
+urlpatterns = patterns('Bcfg2.Server.Hostbase.hostbase.views',
                        
                        (r'^admin/', include('django.contrib.admin.urls')),
                        (r'^hostbase/$', 'search'),
@@ -22,16 +22,6 @@ urlpatterns = patterns('Hostbase.hostbase.views',
                        (r'^hostbase/zones/(?P<zone_id>\d+)/(?P<item>\D+)/(?P<item_id>\d+)/confirm', 'confirm'),
                        )
 
-#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
-os.environ['bcfg_media_root'] = '/usr/lib/python2.4/site-packages/Hostbase/media'
-
-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'}),