diff options
| author | Michael Elkins <melkins@tislabs.com> | 2012-11-27 00:27:55 +0000 |
|---|---|---|
| committer | Michael Elkins <melkins@tislabs.com> | 2012-11-27 00:27:55 +0000 |
| commit | 968d98c3c95dff6ceee72aca0e578005a542fb6a (patch) | |
| tree | fe237866b2bab396a68ec89296b732c5984042af /rpkid/rpki/gui/urls.py | |
| parent | f8fd12d05845f6b9838bdba351caec4e55fda6d0 (diff) | |
| parent | 959f39ff771104e6c968919e216e6e20ff418ad8 (diff) | |
merge ^/branches/tk329
see #329
svn path=/trunk/; revision=4914
Diffstat (limited to 'rpkid/rpki/gui/urls.py')
| -rw-r--r-- | rpkid/rpki/gui/urls.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/rpkid/rpki/gui/urls.py b/rpkid/rpki/gui/urls.py index 598313bb..52949b73 100644 --- a/rpkid/rpki/gui/urls.py +++ b/rpkid/rpki/gui/urls.py @@ -26,15 +26,11 @@ urlpatterns = patterns('', # Uncomment the next line to enable the admin: #(r'^admin/', include(admin.site.urls)), - (r'^rpki/', include('rpki.gui.app.urls')), + (r'^api/', include('rpki.gui.api.urls')), (r'^cacheview/', include('rpki.gui.cacheview.urls')), + (r'^rpki/', include('rpki.gui.app.urls')), (r'^accounts/login/$', 'django.contrib.auth.views.login'), (r'^accounts/logout/$', 'django.contrib.auth.views.logout', {'next_page': '/rpki/'}), - - # !!!REMOVE THIS BEFORE COMMITTING!!! - # for testing with the django test webserver - (r'^site_media/(?P<path>.*)$', 'django.views.static.serve', - {'document_root': '/usr/local/share/rpki/media'}), ) |