diff mbox

[Branch,~linaro-validation/lava-server/trunk] Rev 332: Re-introduce mount points in URLs

Message ID 20111205231713.29448.4363.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Zygmunt Krynicki Dec. 5, 2011, 11:17 p.m. UTC 
------------------------------------------------------------
revno: 332
committer: Zygmunt Krynicki <zygmunt.krynicki@linaro.org>
branch nick: trunk
timestamp: Tue 2011-12-06 00:14:55 +0100
message:
  Re-introduce mount points in URLs
modified:
  lava_server/urls.py


--
lp:lava-server
https://code.launchpad.net/~linaro-validation/lava-server/trunk

You are subscribed to branch lp:lava-server.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-server/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'lava_server/urls.py'
--- lava_server/urls.py	2011-11-29 19:46:42 +0000
+++ lava_server/urls.py	2011-12-05 23:14:55 +0000
@@ -34,38 +34,38 @@ 
 # Root URL patterns
 urlpatterns = patterns(
     '',
-    url(r'^$',
+    url(r'^{mount_point}$'.format(mount_point=settings.MOUNT_POINT),
         index,
         name='lava.home'),
-    url(r'^me/$',
+    url(r'^{mount_point}me/$'.format(mount_point=settings.MOUNT_POINT),
         me,
         name='lava.me'),
-    url(r'^version/$',
+    url(r'^{mount_point}version/$'.format(mount_point=settings.MOUNT_POINT),
         version,
         name='lava.version_details'),
-    url(r'^accounts/',
+    url(r'^{mount_point}accounts/'.format(mount_point=settings.MOUNT_POINT),
         include('django.contrib.auth.urls')),
-    url(r'^admin/',
+    url(r'^{mount_point}admin/'.format(mount_point=settings.MOUNT_POINT),
         include(admin.site.urls)),
-    url(r'^openid/',
+    url(r'^{mount_point}openid/'.format(mount_point=settings.MOUNT_POINT),
         include('django_openid_auth.urls')),
-    url(r'^RPC2/',
+    url(r'^{mount_point}RPC2/'.format(mount_point=settings.MOUNT_POINT),
         'linaro_django_xmlrpc.views.handler',
         name='lava.api_handler',
         kwargs={
             'mapper': loader.xmlrpc_mapper,
             'help_view': 'lava.api_help'}),
-    url(r'^api/help/$',
+    url(r'^{mount_point}api/help/$'.format(mount_point=settings.MOUNT_POINT),
         'linaro_django_xmlrpc.views.help',
         name='lava.api_help',
         kwargs={
             'mapper': loader.xmlrpc_mapper}),
-    url(r'^api/',
+    url(r'^{mount_point}api/'.format(mount_point=settings.MOUNT_POINT),
         include(api_urls.token_urlpatterns)),
     # XXX: This is not needed but without it linaro-django-xmlrpc tests fail
-    url(r'^api/',
+    url(r'^{mount_point}api/'.format(mount_point=settings.MOUNT_POINT),
         include(api_urls.default_mapper_urlpatterns)),
-    url(r'^utils/markitup/',
+    url(r'^{mount_point}utils/markitup/'.format(mount_point=settings.MOUNT_POINT),
         include('lava_markitup.urls')))