aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'master/master/urls.py')
-rw-r--r--master/master/urls.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/master/master/urls.py b/master/master/urls.py
index c00ad82..2888411 100644
--- a/master/master/urls.py
+++ b/master/master/urls.py
@@ -23,8 +23,10 @@ urlpatterns += patterns('master.views',
urlpatterns += patterns('master.slave_api',
(r'^slave_api/jobs/$', 'job_list'),
- (r'^slave_api/jobs/(?P<username>[a-zA-Z0-9_]+)/$', 'job_list'),
- (r'^slave_api/jobs/(?P<username>[a-zA-Z0-9_]+)/(?P<job_name>[^/]+)/$', 'job_list'),
+ (r'^slave_api/jobs/~(?P<username>[a-zA-Z0-9_]+)/$', 'job_list'),
+ (r'^slave_api/jobs/~(?P<username>[a-zA-Z0-9_]+)/(?P<job_name>[^/]+)/$', 'job_list'),
+ ('^slave_api/autotua_master.asc', 'get_pubkey'),
+ (r'^slave_api/slaves/accept/$', 'accept_job'),
)
# Static media serving for development purposes