diff options
| -rw-r--r-- | aa-local.yaml | 16 | ||||
| -rw-r--r-- | aa-server.yaml | 16 | ||||
| -rw-r--r-- | config | 4 | ||||
| -rw-r--r-- | opentox-ruby.sh | 5 |
4 files changed, 18 insertions, 23 deletions
diff --git a/aa-local.yaml b/aa-local.yaml index 593ba56..ebfd667 100644 --- a/aa-local.yaml +++ b/aa-local.yaml @@ -15,24 +15,24 @@ # Exceptions: :free_uris: #request-method for uri not controlled by A&A ? - :GET - : - !ruby/regexp /http:\/\/ESCAPEDSERVERNAME\/algorithm/ + : - !ruby/regexp /http:\/\/ESCAPEDSERVER\/algorithm/ - "http://SERVERNAME/model" - "http://SERVERNAME/validation" - - !ruby/regexp /http:\/\/ESCAPEDSERVERNAME\/validation\/[a-z,A-Z,\/,_\-]*$/ + - !ruby/regexp /http:\/\/ESCAPEDSERVER\/validation\/[a-z,A-Z,\/,_\-]*$/ ? - :GET - :POST - : - !ruby/regexp /http:\/\/ESCAPEDSERVERNAME\/toxcreate/ - - !ruby/regexp /http:\/\/ESCAPEDSERVERNAME\/task/ - - !ruby/regexp /http:\/\/ESCAPEDSERVERNAME\/compound/ + : - !ruby/regexp /http:\/\/ESCAPEDSERVER\/toxcreate/ + - !ruby/regexp /http:\/\/ESCAPEDSERVER\/task/ + - !ruby/regexp /http:\/\/ESCAPEDSERVER\/compound/ ? - :PUT - : - !ruby/regexp /http:\/\/ESCAPEDSERVERNAME\/task/ + : - !ruby/regexp /http:\/\/ESCAPEDSERVER\/task/ :authorize_exceptions: #request-method for uri only authenticated, no authorization ? - :POST - : - !ruby/regexp /http:\/\/ESCAPEDSERVERNAME\/algorithm/ + : - !ruby/regexp /http:\/\/ESCAPEDSERVER\/algorithm/ - "http://SERVERNAME/dataset" - "http://SERVERNAME/model" - "http://SERVERNAME/validation" - - !ruby/regexp /http\:\/\/ESCAPEDSERVERNAME\/validation\/[a-z,A-Z,\/,_\-]*$/ + - !ruby/regexp /http\:\/\/ESCAPEDSERVE\/validation\/[a-z,A-Z,\/,_\-]*$/ diff --git a/aa-server.yaml b/aa-server.yaml index 593ba56..ebfd667 100644 --- a/aa-server.yaml +++ b/aa-server.yaml @@ -15,24 +15,24 @@ # Exceptions: :free_uris: #request-method for uri not controlled by A&A ? - :GET - : - !ruby/regexp /http:\/\/ESCAPEDSERVERNAME\/algorithm/ + : - !ruby/regexp /http:\/\/ESCAPEDSERVER\/algorithm/ - "http://SERVERNAME/model" - "http://SERVERNAME/validation" - - !ruby/regexp /http:\/\/ESCAPEDSERVERNAME\/validation\/[a-z,A-Z,\/,_\-]*$/ + - !ruby/regexp /http:\/\/ESCAPEDSERVER\/validation\/[a-z,A-Z,\/,_\-]*$/ ? - :GET - :POST - : - !ruby/regexp /http:\/\/ESCAPEDSERVERNAME\/toxcreate/ - - !ruby/regexp /http:\/\/ESCAPEDSERVERNAME\/task/ - - !ruby/regexp /http:\/\/ESCAPEDSERVERNAME\/compound/ + : - !ruby/regexp /http:\/\/ESCAPEDSERVER\/toxcreate/ + - !ruby/regexp /http:\/\/ESCAPEDSERVER\/task/ + - !ruby/regexp /http:\/\/ESCAPEDSERVER\/compound/ ? - :PUT - : - !ruby/regexp /http:\/\/ESCAPEDSERVERNAME\/task/ + : - !ruby/regexp /http:\/\/ESCAPEDSERVER\/task/ :authorize_exceptions: #request-method for uri only authenticated, no authorization ? - :POST - : - !ruby/regexp /http:\/\/ESCAPEDSERVERNAME\/algorithm/ + : - !ruby/regexp /http:\/\/ESCAPEDSERVER\/algorithm/ - "http://SERVERNAME/dataset" - "http://SERVERNAME/model" - "http://SERVERNAME/validation" - - !ruby/regexp /http\:\/\/ESCAPEDSERVERNAME\/validation\/[a-z,A-Z,\/,_\-]*$/ + - !ruby/regexp /http\:\/\/ESCAPEDSERVE\/validation\/[a-z,A-Z,\/,_\-]*$/ @@ -5,10 +5,6 @@ # Linux distribution (currently only debian) distribution=debian -# Choose a root password for the MySQL database -# Please insert the correct password if mysql-server is already installed -mysql_root=opentox - # Installation type # Options: # gem installs only the opentox-ruby gem (useful, if you want to use external services with the opentox-ruby DSL) diff --git a/opentox-ruby.sh b/opentox-ruby.sh index 6302009..70de013 100644 --- a/opentox-ruby.sh +++ b/opentox-ruby.sh @@ -27,9 +27,8 @@ fi mkdir -p $HOME/.opentox/config mkdir -p $HOME/.opentox/log -#sed -e "s/SERVERNAME/$servername/;s/LOGGER/$logger/;s/AA/$aa/" production.yaml > $HOME/.opentox/config/production.yaml -sed -e "s/PASSWORD/$password/;s/SERVERNAME/$servername/;s/ESCAPEDSERVERNAME/$escapedservername/;s/LOGGER/$logger/;s/AA/$aa/" production.yaml > $HOME/.opentox/config/production.yaml -sed -e "s/PASSWORD/$password/;s/SERVERNAME/$servername/;s/ESCAPEDSERVERNAME/$escapedservername/;s/LOGGER/$logger/;s/AA/$aa/" aa-$install.yaml >> $HOME/.opentox/config/production.yaml +sed -e "s/SERVERNAME/$servername/;s/ESCAPEDSERVER/$escapedservername/;s/LOGGER/$logger/;s/AA/$aa/" production.yaml > $HOME/.opentox/config/production.yaml +sed -e "s/SERVERNAME/$servername/;s/ESCAPEDSERVER/$escapedservername/;s/LOGGER/$logger/;s/AA/$aa/" aa-$install.yaml >> $HOME/.opentox/config/production.yaml # checkout development version and link lib to opentox-ruby gem if [ $branch = "development" ] |