summaryrefslogtreecommitdiff
path: root/aa-server.yaml
diff options
context:
space:
mode:
authorrautenberg <rautenberg@in-silico.ch>2012-03-13 12:13:23 +0100
committerrautenberg <rautenberg@in-silico.ch>2012-03-13 12:13:23 +0100
commit65b517dd4494d730bf5602bd070a59d0044efe5b (patch)
tree7443c67b2813a9f04483ba8c59f0fd8c2a798923 /aa-server.yaml
parentfe3e3f88762df7cc57df76fe4d2a10602a3daa73 (diff)
parent803ae809cc5092e082ee527dac6eb25c1a63dcf3 (diff)
Merge branch 'release/v3.1.0'v3.1.0
Diffstat (limited to 'aa-server.yaml')
-rw-r--r--aa-server.yaml32
1 files changed, 17 insertions, 15 deletions
diff --git a/aa-server.yaml b/aa-server.yaml
index fe86a2e..ee75705 100644
--- a/aa-server.yaml
+++ b/aa-server.yaml
@@ -14,25 +14,27 @@
# Exceptions:
:free_uris: #request-method for uri not controlled by A&A
? - :GET
- : - !ruby/regexp /http:\/\/ESCAPEDSERVER\/algorithm/
- - "http://SERVERNAME/model"
- - "http://SERVERNAME/dataset"
- - "http://SERVERNAME/validation"
- - !ruby/regexp /http:\/\/ESCAPEDSERVER\/validation\/resources/
- - !ruby/regexp /http:\/\/ESCAPEDSERVER\/validation\/[a-z,A-Z,\/,_\-]*$/
+ : - !ruby/regexp /http:\/\/ESCAPEDSERVERNGINX_PORT\/algorithm/
+ - "http://SERVERNAMENGINX_PORT/model"
+ - "http://SERVERNAMENGINX_PORT/dataset"
+ - "http://SERVERNAMENGINX_PORT/validation"
+ - !ruby/regexp /http:\/\/ESCAPEDSERVERNGINX_PORT\/validation\/resources/
+ - !ruby/regexp /http:\/\/ESCAPEDSERVERNGINX_PORT\/validation\/[a-z,A-Z,\/,_\-]*$/
? - :GET
- :POST
- : - !ruby/regexp /http:\/\/ESCAPEDSERVER\/toxcreate\/[a-z,A-Z,\/,_\-]*$/
- - !ruby/regexp /http:\/\/ESCAPEDSERVER\/task/
- - !ruby/regexp /http:\/\/ESCAPEDSERVER\/compound/
+ : - !ruby/regexp /http:\/\/ESCAPEDSERVERNGINX_PORT\/toxcreate\/[a-z,A-Z,\/,_\-]*$/
+ - !ruby/regexp /http:\/\/ESCAPEDSERVERNGINX_PORT\/task/
+ - !ruby/regexp /http:\/\/ESCAPEDSERVERNGINX_PORT\/compound/
- !ruby/regexp /sign_(in|out)$/
? - :PUT
- : - !ruby/regexp /http:\/\/ESCAPEDSERVER\/task/
+ : - !ruby/regexp /http:\/\/ESCAPEDSERVERNGINX_PORT\/task/
+ ? - :DELETE
+ : - "http://SERVERNAMENGINX_PORT/task/cleanup"
:authorize_exceptions: #request-method for uri only authenticated, no authorization
? - :POST
- : - !ruby/regexp /http:\/\/ESCAPEDSERVER\/algorithm/
- - "http://SERVERNAME/dataset"
- - "http://SERVERNAME/model"
- - "http://SERVERNAME/validation"
- - !ruby/regexp /http\:\/\/ESCAPEDSERVER\/validation\/[a-z,A-Z,\/,_\-]*$/
+ : - !ruby/regexp /http:\/\/ESCAPEDSERVERNGINX_PORT\/algorithm/
+ - "http://SERVERNAMENGINX_PORT/dataset"
+ - "http://SERVERNAMENGINX_PORT/model"
+ - "http://SERVERNAMENGINX_PORT/validation"
+ - !ruby/regexp /http\:\/\/ESCAPEDSERVERNGINX_PORT\/validation\/[a-z,A-Z,\/,_\-]*$/