diff options
author | Andreas Maunz <andreas@maunz.de> | 2011-11-16 17:42:15 +0100 |
---|---|---|
committer | Andreas Maunz <andreas@maunz.de> | 2011-11-16 17:42:15 +0100 |
commit | a1886db9d8b27434fe78457b0ad60e6e22932d1b (patch) | |
tree | 9212cb83d2921536e39ef3188d5f25151e889b14 /aa-local.yaml | |
parent | 7776175ac7166537408d30e6a8f7210f8e9a9a3d (diff) | |
parent | 47cdf2243d076ade575894fdefe14f99107e2160 (diff) |
Merge branch 'development' of github.com:opentox/install into development
Conflicts:
config.sh
Diffstat (limited to 'aa-local.yaml')
-rw-r--r-- | aa-local.yaml | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/aa-local.yaml b/aa-local.yaml index 5ca2b72..aa08799 100644 --- a/aa-local.yaml +++ b/aa-local.yaml @@ -15,25 +15,25 @@ # Exceptions: :free_uris: #request-method for uri not controlled by A&A ? - :GET - : - !ruby/regexp /http:\/\/ESCAPEDSERVERPORT\/algorithm/ - - "http://SERVERNAMEPORT/model" - - "http://SERVERNAMEPORT/dataset" - - "http://SERVERNAMEPORT/validation" - - !ruby/regexp /http:\/\/ESCAPEDSERVERPORT\/validation\/resources/ - - !ruby/regexp /http:\/\/ESCAPEDSERVERPORT\/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:\/\/ESCAPEDSERVERPORT\/toxcreate\/[a-z,A-Z,\/,_\-]*$/ - - !ruby/regexp /http:\/\/ESCAPEDSERVERPORT\/task/ - - !ruby/regexp /http:\/\/ESCAPEDSERVERPORT\/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:\/\/ESCAPEDSERVERPORT\/task/ + : - !ruby/regexp /http:\/\/ESCAPEDSERVERNGINX_PORT\/task/ :authorize_exceptions: #request-method for uri only authenticated, no authorization ? - :POST - : - !ruby/regexp /http:\/\/ESCAPEDSERVERPORT\/algorithm/ - - "http://SERVERNAMEPORT/dataset" - - "http://SERVERNAMEPORT/model" - - "http://SERVERNAMEPORT/validation" - - !ruby/regexp /http\:\/\/ESCAPEDSERVERPORT\/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,\/,_\-]*$/ |