diff options
author | Christoph Helma <helma@in-silico.ch> | 2011-03-08 13:50:07 +0100 |
---|---|---|
committer | Christoph Helma <helma@in-silico.ch> | 2011-03-08 13:50:07 +0100 |
commit | dbe3056c8af7be9b623b020055e4892ca44954b2 (patch) | |
tree | 8ad17db4525670cf23cb7a0a5eec1d910062fe6f | |
parent | 152526cb79878eee9c7e48189141c5085503f6a5 (diff) |
typo in instalation type fixed
-rw-r--r-- | config | 2 | ||||
-rwxr-xr-x | install | 1 | ||||
-rw-r--r-- | opentox-ruby.sh | 4 |
3 files changed, 4 insertions, 3 deletions
@@ -14,7 +14,7 @@ mysql_root=opentox # gem installs only the opentox-ruby gem (useful, if you want to use external services with the opentox-ruby DSL) # local local installation (authentication and authorisation disabled) # server inter or intranet server (authentication and authorisation enabled) -type=server +install=server # Git branch of services # Options: master test development @@ -6,6 +6,7 @@ . ./openbabel.sh . ./kernlab.sh . ./opentox-ruby.sh + if [ $install != "gem" ] then . ./nginx.sh diff --git a/opentox-ruby.sh b/opentox-ruby.sh index 595ee36..98b04f1 100644 --- a/opentox-ruby.sh +++ b/opentox-ruby.sh @@ -18,7 +18,7 @@ else logger="" fi -if [ $type = "server" ] +if [ $install = "server" ] then aa="https:\/\/opensso.in-silico.ch" else @@ -29,7 +29,7 @@ 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-$type.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 # checkout development version and link lib to opentox-ruby gem if [ $branch = "development" ] |