summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoram <am@z21mn.(none)>2011-12-20 11:22:58 +0100
committeram <am@z21mn.(none)>2011-12-20 11:22:58 +0100
commit73747676c8afa6188c87ea6795f3db940ab59b9c (patch)
tree8b4f7af76e61bb8c30bdcbb0115e40a71b09c1ed
parentd13ae21e492357bb93947998a298bb1a7af1a625 (diff)
Fixed bugs 1., 2., 6. of http://goo.gl/1InHw
-rw-r--r--base-install.sh2
-rwxr-xr-xconfig.sh4
2 files changed, 3 insertions, 3 deletions
diff --git a/base-install.sh b/base-install.sh
index 90abb6e..5fccec5 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:"
diff --git a/config.sh b/config.sh
index 60dff2a..87b19b7 100755
--- a/config.sh
+++ b/config.sh
@@ -11,13 +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"
KL_NUM_VER="0.9-11"
-REDIS_NUM_VER="2.2.2"
+REDIS_NUM_VER="2.4.4"
# 4) Server settings.
NGINX_SERVERNAME="toxcreate3.in-silico.ch"