diff options
author | mr <mr@mrautenberg.de> | 2011-09-23 12:32:31 +0200 |
---|---|---|
committer | mr <mr@mrautenberg.de> | 2011-09-23 12:32:31 +0200 |
commit | 444754e872c4a162cbbbff1eed9021f3eb6c4843 (patch) | |
tree | d03bf659e4db9cb328155de5bdb33cf8c8def7d0 | |
parent | ee2318c457e040a4891d256ef52c2bb3c0aeea8a (diff) | |
parent | 63f13641aafbaf7dcdb2401b8d42449baa132bcb (diff) |
Merge branch 'release/v3.0.0'v3.0.0
-rw-r--r-- | aa-local.yaml | 2 | ||||
-rw-r--r-- | aa-server.yaml | 2 | ||||
-rw-r--r-- | production.yaml | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/aa-local.yaml b/aa-local.yaml index 723d50a..260c72e 100644 --- a/aa-local.yaml +++ b/aa-local.yaml @@ -23,7 +23,7 @@ - !ruby/regexp /http:\/\/ESCAPEDSERVER\/validation\/[a-z,A-Z,\/,_\-]*$/ ? - :GET - :POST - : - !ruby/regexp /http:\/\/ESCAPEDSERVER\/toxcreate/ + : - !ruby/regexp /http:\/\/ESCAPEDSERVER\/toxcreate\/[a-z,A-Z,\/,_\-]*$/ - !ruby/regexp /http:\/\/ESCAPEDSERVER\/task/ - !ruby/regexp /http:\/\/ESCAPEDSERVER\/compound/ - !ruby/regexp /sign_(in|out)$/ diff --git a/aa-server.yaml b/aa-server.yaml index 723d50a..260c72e 100644 --- a/aa-server.yaml +++ b/aa-server.yaml @@ -23,7 +23,7 @@ - !ruby/regexp /http:\/\/ESCAPEDSERVER\/validation\/[a-z,A-Z,\/,_\-]*$/ ? - :GET - :POST - : - !ruby/regexp /http:\/\/ESCAPEDSERVER\/toxcreate/ + : - !ruby/regexp /http:\/\/ESCAPEDSERVER\/toxcreate\/[a-z,A-Z,\/,_\-]*$/ - !ruby/regexp /http:\/\/ESCAPEDSERVER\/task/ - !ruby/regexp /http:\/\/ESCAPEDSERVER\/compound/ - !ruby/regexp /sign_(in|out)$/ diff --git a/production.yaml b/production.yaml index f3eee2c..09efad0 100644 --- a/production.yaml +++ b/production.yaml @@ -9,8 +9,9 @@ opentox-task: "http://SERVERNAME/task/" opentox-toxcreate: "http://SERVERNAME/toxcreate/" opentox-validation: "http://SERVERNAME/validation/" + opentox-ontology: "http://apps.ideaconsult.net:8080/ontology" -:yaml_hosts: +:json_hosts: - "localhost" - "SERVERNAME" - "webservices.in-silico.ch" |