diff options
| -rw-r--r-- | aa-local.yaml | 2 | ||||
| -rw-r--r-- | aa-server.yaml | 2 | ||||
| -rw-r--r-- | base-install.sh | 2 | ||||
| -rwxr-xr-x | config.sh | 5 | ||||
| -rw-r--r-- | ot-tools-user.sh | 2 |
5 files changed, 9 insertions, 4 deletions
diff --git a/aa-local.yaml b/aa-local.yaml index aa08799..75cccd0 100644 --- a/aa-local.yaml +++ b/aa-local.yaml @@ -29,6 +29,8 @@ - !ruby/regexp /sign_(in|out)$/ ? - :PUT : - !ruby/regexp /http:\/\/ESCAPEDSERVERNGINX_PORT\/task/ + ? - :DELETE + : - "http://SERVERNAMENGINX_PORT/task/cleanup" :authorize_exceptions: #request-method for uri only authenticated, no authorization ? - :POST diff --git a/aa-server.yaml b/aa-server.yaml index aa08799..75cccd0 100644 --- a/aa-server.yaml +++ b/aa-server.yaml @@ -29,6 +29,8 @@ - !ruby/regexp /sign_(in|out)$/ ? - :PUT : - !ruby/regexp /http:\/\/ESCAPEDSERVERNGINX_PORT\/task/ + ? - :DELETE + : - "http://SERVERNAMENGINX_PORT/task/cleanup" :authorize_exceptions: #request-method for uri only authenticated, no authorization ? - :POST diff --git a/base-install.sh b/base-install.sh index a1ee2bf..73c9e37 100644 --- a/base-install.sh +++ b/base-install.sh @@ -27,7 +27,7 @@ fi touch $OT_UI_CONF # Pkgs -packs="binutils build-essential git-core gnuplot hostname libcurl4-openssl-dev libgsl0-dev libreadline-dev libsqlite3-dev libssl-dev libxml2-dev libxslt1-dev lsb-release psmisc pwgen raptor-utils r-base r-base-core r-base-dev sqlite3 sun-java6-jdk wget xsltproc zlib1g-dev" +packs="binutils build-essential git-core gnuplot hostname libcurl4-openssl-dev libgsl0-dev libreadline6-dev libreadline-dev libsqlite3-dev libssl-dev libxml2-dev libxslt1-dev lsb-release openjdk-6-jdk psmisc pwgen raptor-utils r-base r-base-core r-base-dev sqlite3 wget xsltproc zlib1g-dev" echo echo "Base Packages:" @@ -11,12 +11,13 @@ OT_BRANCH="development" # Maturity (development -you need SSH k # 2) Where all binaries are installed. OT_PREFIX="$HOME/opentox-ruby" -OT_JAVA_HOME="/usr/lib/jvm/java-6-sun" +OT_JAVA_HOME="/usr/lib/jvm/java-6-openjdk" # 3) What versions to install. RUBY_NUM_VER="1.8.7-2011.03" OB_NUM_VER="2.2.3" -REDIS_NUM_VER="2.2.2" +KL_NUM_VER="0.9-11" +REDIS_NUM_VER="2.4.4" # 4) Server settings. NGINX_SERVERNAME="toxcreate3.in-silico.ch" diff --git a/ot-tools-user.sh b/ot-tools-user.sh index 1ad02f4..57c6c00 100644 --- a/ot-tools-user.sh +++ b/ot-tools-user.sh @@ -52,7 +52,7 @@ otupdate() { otstart() { otconfig otkill - bash -c "nohup redis-server $HOME/opentox-ruby/redis-2.2.2/redis.conf >/dev/null 2>&1 &" + bash -c "nohup redis-server $HOME/opentox-ruby/redis-*/redis.conf >/dev/null 2>&1 &" bash -c "nohup nginx -c $HOME/opentox-ruby/nginx/conf/nginx.conf >/dev/null 2>&1 &" sleep 2 if ! pgrep -u $USER nginx>/dev/null 2>&1; then echo "Failed to start nginx."; fi |