aboutsummaryrefslogtreecommitdiff
path: root/portal-gui/rpkigui/urls.py
diff options
context:
space:
mode:
authorMichael Elkins <melkins@tislabs.com>2010-07-01 00:09:36 +0000
committerMichael Elkins <melkins@tislabs.com>2010-07-01 00:09:36 +0000
commit44da2a8aaae8181269d35729ae3d165dec4a68d5 (patch)
tree168db92e1414e7a07c487f746e82050918eb7a58 /portal-gui/rpkigui/urls.py
parente59901e2bbdea5d6a9e4c26f699499c9c7696abe (diff)
commit recent rpki changes
svn path=/portal-gui/rpkigui/myrpki/admin.py; revision=3305
Diffstat (limited to 'portal-gui/rpkigui/urls.py')
-rw-r--r--portal-gui/rpkigui/urls.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/portal-gui/rpkigui/urls.py b/portal-gui/rpkigui/urls.py
index f754fb23..b5947c91 100644
--- a/portal-gui/rpkigui/urls.py
+++ b/portal-gui/rpkigui/urls.py
@@ -14,14 +14,15 @@ urlpatterns = patterns('',
# Uncomment the next line to enable the admin:
(r'^admin/', include(admin.site.urls)),
- (r'^dashboard/', include('myrpki.dashboardurls')),
- (r'^myrpki/', include('myrpki.urls')),
+ #(r'^dashboard/', include('myrpki.dashboardurls')),
+ (r'^myrpki/', include('rpkigui.myrpki.urls')),
(r'^accounts/login/$', 'django.contrib.auth.views.login'),
(r'^accounts/logout/$', 'django.contrib.auth.views.logout'),
#XXX
(r'^site_media/(?P<path>.*)$', 'django.views.static.serve',
- {'document_root': '/Users/fenner/src/portal-gui/media/'}),
+ #{'document_root': '/Users/fenner/src/portal-gui/media/'}),
+ {'document_root': '/home/me/src/rpki/portal-gui/media/'}),
)