diff options
| author | Andreas Maunz <andreas@maunz.de> | 2011-05-26 08:21:01 +0200 |
|---|---|---|
| committer | Andreas Maunz <andreas@maunz.de> | 2011-05-26 08:21:01 +0200 |
| commit | a552b6d33c6a7b0017f76686491f0859fc6c6dcf (patch) | |
| tree | 4fd5c67e39cf7159df4f905731a048ac8bcef95a | |
| parent | 764432e259397e42aacedd1f697e00f9beaeedc8 (diff) | |
| parent | 957518dbff6a80bab1d4bbadde55cbb474a27e6e (diff) | |
Merge branch 'development' of github.com:opentox/install into development
| -rw-r--r-- | aa-local.yaml | 3 | ||||
| -rw-r--r-- | aa-server.yaml | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/aa-local.yaml b/aa-local.yaml index c01c1ed..7c3bbce 100644 --- a/aa-local.yaml +++ b/aa-local.yaml @@ -18,13 +18,14 @@ : - !ruby/regexp /http:\/\/ESCAPEDSERVER\/algorithm/ - "http://SERVERNAME/model" - "http://SERVERNAME/validation" + - !ruby/regexp /http:\/\/ESCAPEDSERVER\/validation\/resources/ - !ruby/regexp /http:\/\/ESCAPEDSERVER\/validation\/[a-z,A-Z,\/,_\-]*$/ ? - :GET - :POST : - !ruby/regexp /http:\/\/ESCAPEDSERVER\/toxcreate/ - !ruby/regexp /http:\/\/ESCAPEDSERVER\/task/ - !ruby/regexp /http:\/\/ESCAPEDSERVER\/compound/ - + - !ruby/regexp /sign_(in|out)$/ ? - :PUT : - !ruby/regexp /http:\/\/ESCAPEDSERVER\/task/ diff --git a/aa-server.yaml b/aa-server.yaml index c01c1ed..7c3bbce 100644 --- a/aa-server.yaml +++ b/aa-server.yaml @@ -18,13 +18,14 @@ : - !ruby/regexp /http:\/\/ESCAPEDSERVER\/algorithm/ - "http://SERVERNAME/model" - "http://SERVERNAME/validation" + - !ruby/regexp /http:\/\/ESCAPEDSERVER\/validation\/resources/ - !ruby/regexp /http:\/\/ESCAPEDSERVER\/validation\/[a-z,A-Z,\/,_\-]*$/ ? - :GET - :POST : - !ruby/regexp /http:\/\/ESCAPEDSERVER\/toxcreate/ - !ruby/regexp /http:\/\/ESCAPEDSERVER\/task/ - !ruby/regexp /http:\/\/ESCAPEDSERVER\/compound/ - + - !ruby/regexp /sign_(in|out)$/ ? - :PUT : - !ruby/regexp /http:\/\/ESCAPEDSERVER\/task/ |