From 424abba2902b71ce95b07f550f2c2841d13265ee Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Tue, 29 Mar 2011 12:58:21 +0200 Subject: Added config.sh --- config.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 config.sh (limited to 'config.sh') diff --git a/config.sh b/config.sh new file mode 100644 index 0000000..8eb5aff --- /dev/null +++ b/config.sh @@ -0,0 +1,16 @@ +# Dest +JAVA_CONF=$HOME/.bash_java_ot + +RUBY_VER="ruby-enterprise-1.8.7-2011.03" +RUBY_CONF=$HOME/.bash_ruby_ot +RUBY_DEST="$HOME/$RUB_YVER" + +OB_NUM_VER="2.2.3" +OB_VER="openbabel-$OB_NUM_VER" +OB_DEST="$HOME/$OB_VER" + +KL_VER="0.9-11" +KL_CONF="$HOME/.bash_R_ot" +KL_DEST="$HOME/r-packages" + +NGINX_DEST=$HOME/nginx -- cgit v1.2.3 From 78a251a002390dafd1f26271e9b8a531fb9aea14 Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Tue, 29 Mar 2011 13:06:32 +0200 Subject: Nginx fix: ENV variable --- config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config.sh') diff --git a/config.sh b/config.sh index 8eb5aff..fad153b 100644 --- a/config.sh +++ b/config.sh @@ -3,7 +3,7 @@ JAVA_CONF=$HOME/.bash_java_ot RUBY_VER="ruby-enterprise-1.8.7-2011.03" RUBY_CONF=$HOME/.bash_ruby_ot -RUBY_DEST="$HOME/$RUB_YVER" +RUBY_DEST="$HOME/$RUBY_VER" OB_NUM_VER="2.2.3" OB_VER="openbabel-$OB_NUM_VER" -- cgit v1.2.3 From e23e1a7f0f04033de1872d2c2e61e244e6208d4c Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Tue, 29 Mar 2011 13:34:25 +0200 Subject: Redis --- config.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'config.sh') diff --git a/config.sh b/config.sh index fad153b..574552c 100644 --- a/config.sh +++ b/config.sh @@ -1,8 +1,8 @@ # Dest -JAVA_CONF=$HOME/.bash_java_ot +JAVA_CONF="$HOME/.bash_java_ot" RUBY_VER="ruby-enterprise-1.8.7-2011.03" -RUBY_CONF=$HOME/.bash_ruby_ot +RUBY_CONF="$HOME/.bash_ruby_ot" RUBY_DEST="$HOME/$RUBY_VER" OB_NUM_VER="2.2.3" @@ -14,3 +14,8 @@ KL_CONF="$HOME/.bash_R_ot" KL_DEST="$HOME/r-packages" NGINX_DEST=$HOME/nginx + +REDIS_VER="2.2.2" +REDIS_SERVER_CONF="$HOME/.redis.conf" +REDIS_CONF="$HOME/.bash_redis_ot" +REDIS_DEST="$HOME/redis-$REDIS_VER" -- cgit v1.2.3 From 9ac9100ef477fbe3e98a5d0c57d2def5b84bdd75 Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Tue, 29 Mar 2011 14:07:32 +0200 Subject: opentox-webservices --- config.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'config.sh') diff --git a/config.sh b/config.sh index 574552c..211ad6a 100644 --- a/config.sh +++ b/config.sh @@ -19,3 +19,5 @@ REDIS_VER="2.2.2" REDIS_SERVER_CONF="$HOME/.redis.conf" REDIS_CONF="$HOME/.bash_redis_ot" REDIS_DEST="$HOME/redis-$REDIS_VER" + +WWW_DEST="$HOME/www" -- cgit v1.2.3 From 12f42b70b451254f2865a379c1bb1d2ab964e9ff Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Wed, 30 Mar 2011 14:56:53 +0200 Subject: opentox-ruby --- config.sh | 52 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 16 deletions(-) (limited to 'config.sh') diff --git a/config.sh b/config.sh index 211ad6a..c0a1d36 100644 --- a/config.sh +++ b/config.sh @@ -1,23 +1,43 @@ -# Dest -JAVA_CONF="$HOME/.bash_java_ot" +#!/bin/bash +# +# Configuration file for Opentox installer. +# Author: Christoph Helma, Andreas Maunz. +# -RUBY_VER="ruby-enterprise-1.8.7-2011.03" -RUBY_CONF="$HOME/.bash_ruby_ot" -RUBY_DEST="$HOME/$RUBY_VER" +# 1) Where all binaries are installed. +PREFIX="$HOME/opentox" +# 2) What versions to install. +RUBY_NUM_VER="1.8.7-2011.03" OB_NUM_VER="2.2.3" -OB_VER="openbabel-$OB_NUM_VER" -OB_DEST="$HOME/$OB_VER" +KL_NUM_VER="0.9-11" +REDIS_NUM_VER="2.2.2" + +# 3) What server settings. +NGINX_SERVERNAME="localhost" +WWW_DEST="$PREFIX/www" + +# 4) Done. -KL_VER="0.9-11" -KL_CONF="$HOME/.bash_R_ot" -KL_DEST="$HOME/r-packages" -NGINX_DEST=$HOME/nginx +### Nothing to gain from changes below this line. +JAVA_CONF="$PREFIX/.bash_java_ot" +RUBY_CONF="$PREFIX/.bash_ruby_ot" +REDIS_CONF="$PREFIX/.bash_redis_ot" +OB_CONF="$PREFIX/.bash_OB_ot" +KL_CONF="$PREFIX/.bash_R_ot" + +RUBY_VER="ruby-enterprise-$RUBY_NUM_VER" +OB_VER="openbabel-$OB_NUM_VER" +KL_VER="$KL_NUM_VER" +REDIS_VER="$REDIS_NUM_VER" + +RUBY_DEST="$PREFIX/$RUBY_VER" +OB_DEST="$PREFIX/$OB_VER" +OB_DEST_BINDINGS="$PREFIX/openbabel-ruby-install" +KL_DEST="$PREFIX/r-packages" +NGINX_DEST="$PREFIX/nginx" +REDIS_DEST="$PREFIX/redis-$REDIS_VER" -REDIS_VER="2.2.2" -REDIS_SERVER_CONF="$HOME/.redis.conf" -REDIS_CONF="$HOME/.bash_redis_ot" -REDIS_DEST="$HOME/redis-$REDIS_VER" +REDIS_SERVER_CONF="$REDIS_DEST/redis.conf" -WWW_DEST="$HOME/www" -- cgit v1.2.3 From f76f11eaf435397607f2aa5e70496c01005d5c6b Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Wed, 30 Mar 2011 16:22:35 +0200 Subject: base-install --- config.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'config.sh') diff --git a/config.sh b/config.sh index c0a1d36..aebf2d5 100644 --- a/config.sh +++ b/config.sh @@ -6,6 +6,7 @@ # 1) Where all binaries are installed. PREFIX="$HOME/opentox" +JAVA_HOME="/usr/lib/java-6-sun" # 2) What versions to install. RUBY_NUM_VER="1.8.7-2011.03" @@ -13,7 +14,7 @@ OB_NUM_VER="2.2.3" KL_NUM_VER="0.9-11" REDIS_NUM_VER="2.2.2" -# 3) What server settings. +# 3) Server settings. NGINX_SERVERNAME="localhost" WWW_DEST="$PREFIX/www" -- cgit v1.2.3 From be4c94b29fc76904b279056b6a0af234e7cf1f4e Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Thu, 31 Mar 2011 10:58:42 +0200 Subject: config.sh --- config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config.sh') diff --git a/config.sh b/config.sh index aebf2d5..af806e2 100644 --- a/config.sh +++ b/config.sh @@ -6,7 +6,7 @@ # 1) Where all binaries are installed. PREFIX="$HOME/opentox" -JAVA_HOME="/usr/lib/java-6-sun" +JAVA_HOME="/usr/lib/jvm/java-6-sun" # 2) What versions to install. RUBY_NUM_VER="1.8.7-2011.03" -- cgit v1.2.3 From aae109a81e53aa10e720cdb4cfa5c05a3ccb31dd Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Fri, 1 Apr 2011 15:03:46 +0200 Subject: Merged config --- config.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'config.sh') diff --git a/config.sh b/config.sh index af806e2..72c3fec 100644 --- a/config.sh +++ b/config.sh @@ -4,17 +4,22 @@ # Author: Christoph Helma, Andreas Maunz. # -# 1) Where all binaries are installed. +# 1) Base setup +OT_DIST="debian" # Linux distribution (debian) +OT_INSTALL="local" # Type (gem, local, server) +OT_BRANCH="master" # Maturity (development, master) + +# 2) Where all binaries are installed. PREFIX="$HOME/opentox" JAVA_HOME="/usr/lib/jvm/java-6-sun" -# 2) What versions to install. +# 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" -# 3) Server settings. +# 4) Server settings. NGINX_SERVERNAME="localhost" WWW_DEST="$PREFIX/www" -- cgit v1.2.3 From 6e15685c0992a720507209c2c9b43a9c561ade5e Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Fri, 1 Apr 2011 16:27:53 +0200 Subject: Removed bashismsh --- config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config.sh') diff --git a/config.sh b/config.sh index 72c3fec..244ab37 100644 --- a/config.sh +++ b/config.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # # Configuration file for Opentox installer. # Author: Christoph Helma, Andreas Maunz. -- cgit v1.2.3 From f1b3c4ae8fad84b70ed996758925a3d1ad31b6a3 Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Thu, 7 Apr 2011 08:40:06 +0200 Subject: Changed exec status --- config.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 config.sh (limited to 'config.sh') diff --git a/config.sh b/config.sh old mode 100644 new mode 100755 index 244ab37..6d568d9 --- a/config.sh +++ b/config.sh @@ -23,7 +23,7 @@ REDIS_NUM_VER="2.2.2" NGINX_SERVERNAME="localhost" WWW_DEST="$PREFIX/www" -# 4) Done. +# Done. ### Nothing to gain from changes below this line. @@ -46,4 +46,4 @@ NGINX_DEST="$PREFIX/nginx" REDIS_DEST="$PREFIX/redis-$REDIS_VER" REDIS_SERVER_CONF="$REDIS_DEST/redis.conf" - +OT_UI_CONF="$HOME/.opentox-ui.sh" -- cgit v1.2.3 From ae03b88f5c116c079f647bf1a5ba55e0ed387685 Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Thu, 7 Apr 2011 10:06:44 +0200 Subject: Fixed JAVA_HOME --- config.sh | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'config.sh') diff --git a/config.sh b/config.sh index 6d568d9..1e0bb79 100755 --- a/config.sh +++ b/config.sh @@ -10,8 +10,8 @@ OT_INSTALL="local" # Type (gem, local, server) OT_BRANCH="master" # Maturity (development, master) # 2) Where all binaries are installed. -PREFIX="$HOME/opentox" -JAVA_HOME="/usr/lib/jvm/java-6-sun" +OT_PREFIX="$HOME/opentox" +OT_JAVA_HOME="/usr/lib/jvm/java-6-sun" # 3) What versions to install. RUBY_NUM_VER="1.8.7-2011.03" @@ -21,29 +21,29 @@ REDIS_NUM_VER="2.2.2" # 4) Server settings. NGINX_SERVERNAME="localhost" -WWW_DEST="$PREFIX/www" +WWW_DEST="$OT_PREFIX/www" # Done. ### Nothing to gain from changes below this line. -JAVA_CONF="$PREFIX/.bash_java_ot" -RUBY_CONF="$PREFIX/.bash_ruby_ot" -REDIS_CONF="$PREFIX/.bash_redis_ot" -OB_CONF="$PREFIX/.bash_OB_ot" -KL_CONF="$PREFIX/.bash_R_ot" +JAVA_CONF="$OT_PREFIX/.bash_java_ot" +RUBY_CONF="$OT_PREFIX/.bash_ruby_ot" +REDIS_CONF="$OT_PREFIX/.bash_redis_ot" +OB_CONF="$OT_PREFIX/.bash_OB_ot" +KL_CONF="$OT_PREFIX/.bash_R_ot" RUBY_VER="ruby-enterprise-$RUBY_NUM_VER" OB_VER="openbabel-$OB_NUM_VER" KL_VER="$KL_NUM_VER" REDIS_VER="$REDIS_NUM_VER" -RUBY_DEST="$PREFIX/$RUBY_VER" -OB_DEST="$PREFIX/$OB_VER" -OB_DEST_BINDINGS="$PREFIX/openbabel-ruby-install" -KL_DEST="$PREFIX/r-packages" -NGINX_DEST="$PREFIX/nginx" -REDIS_DEST="$PREFIX/redis-$REDIS_VER" +RUBY_DEST="$OT_PREFIX/$RUBY_VER" +OB_DEST="$OT_PREFIX/$OB_VER" +OB_DEST_BINDINGS="$OT_PREFIX/openbabel-ruby-install" +KL_DEST="$OT_PREFIX/r-packages" +NGINX_DEST="$OT_PREFIX/nginx" +REDIS_DEST="$OT_PREFIX/redis-$REDIS_VER" REDIS_SERVER_CONF="$REDIS_DEST/redis.conf" OT_UI_CONF="$HOME/.opentox-ui.sh" -- cgit v1.2.3 From 2140505b9ee2b2b30886dd1b9c5bbf344a708b49 Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Thu, 7 Apr 2011 10:12:47 +0200 Subject: Fixed include file names --- config.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'config.sh') diff --git a/config.sh b/config.sh index 1e0bb79..428c621 100755 --- a/config.sh +++ b/config.sh @@ -27,11 +27,11 @@ WWW_DEST="$OT_PREFIX/www" ### Nothing to gain from changes below this line. -JAVA_CONF="$OT_PREFIX/.bash_java_ot" -RUBY_CONF="$OT_PREFIX/.bash_ruby_ot" -REDIS_CONF="$OT_PREFIX/.bash_redis_ot" -OB_CONF="$OT_PREFIX/.bash_OB_ot" -KL_CONF="$OT_PREFIX/.bash_R_ot" +JAVA_CONF="$OT_PREFIX/.sh_java_ot" +RUBY_CONF="$OT_PREFIX/.sh_ruby_ot" +REDIS_CONF="$OT_PREFIX/.sh_redis_ot" +OB_CONF="$OT_PREFIX/.sh_OB_ot" +KL_CONF="$OT_PREFIX/.sh_R_ot" RUBY_VER="ruby-enterprise-$RUBY_NUM_VER" OB_VER="openbabel-$OB_NUM_VER" -- cgit v1.2.3 From e2da541cecd308ee314267b33476c052f31e3204 Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Mon, 11 Apr 2011 09:10:00 +0200 Subject: Guarding dirs, Linking OB LIB to site_ruby --- config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config.sh') diff --git a/config.sh b/config.sh index 428c621..7fe4006 100755 --- a/config.sh +++ b/config.sh @@ -10,7 +10,7 @@ OT_INSTALL="local" # Type (gem, local, server) OT_BRANCH="master" # Maturity (development, master) # 2) Where all binaries are installed. -OT_PREFIX="$HOME/opentox" +OT_PREFIX="$HOME/opentox-ruby" OT_JAVA_HOME="/usr/lib/jvm/java-6-sun" # 3) What versions to install. -- cgit v1.2.3 From e2dc50e08e9245e401ab5726f04706c825e9deaf Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Wed, 27 Apr 2011 17:14:09 +0200 Subject: Fixed some issues --- config.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'config.sh') diff --git a/config.sh b/config.sh index 7fe4006..5a13b3a 100755 --- a/config.sh +++ b/config.sh @@ -30,6 +30,7 @@ WWW_DEST="$OT_PREFIX/www" JAVA_CONF="$OT_PREFIX/.sh_java_ot" RUBY_CONF="$OT_PREFIX/.sh_ruby_ot" REDIS_CONF="$OT_PREFIX/.sh_redis_ot" +NGINX_CONF="$OT_PREFIX/.sh_nginx_ot" OB_CONF="$OT_PREFIX/.sh_OB_ot" KL_CONF="$OT_PREFIX/.sh_R_ot" -- cgit v1.2.3