ruby enterprise and redis updated

5 files changed, 13 insertions, 12 deletions

diff --git a/debian.sh b/debian.sh
index 53ddac3..af1bb76 100644
--- a/debian.sh
+++ b/debian.sh
@@ -12,10 +12,10 @@ apt-get upgrade -y
 apt-get install binutils gcc g++ gfortran sun-java6-jdk -y
 apt-get install wget hostname pwgen git-core raptor-utils r-base -y
 . ./config
-echo mysql-server-5.1 mysql-server/root_password password $mysql_root | debconf-set-selections
-echo mysql-server-5.1 mysql-server/root_password_again password $mysql_root | debconf-set-selections
-apt-get install mysql-server -y
-apt-get install xsltproc gnuplot -y
+#echo mysql-server-5.1 mysql-server/root_password password $mysql_root | debconf-set-selections
+#echo mysql-server-5.1 mysql-server/root_password_again password $mysql_root | debconf-set-selections
+#apt-get install mysql-server -y
+apt-get install xsltproc gnuplot -y # for validation
 apt-get install libssl-dev zlib1g-dev libreadline-dev libmysqlclient-dev libmysqlclient-dev libcurl4-openssl-dev libxml2-dev libxslt1-dev libgsl0-dev -y
 sed -i '/^JAVA_HOME=/d' /etc/profile
 echo 'export JAVA_HOME=/usr/lib/jvm/java-6-sun' | tee -a /etc/profile
diff --git a/install b/install
index 7e64344..47e6be3 100755
--- a/install
+++ b/install
@@ -3,14 +3,15 @@
 . ./config
 . ./$distribution.sh
 . ./ruby.sh
-. ./nginx.sh
 . ./openbabel.sh
 . ./kernlab.sh
 . ./opentox-ruby.sh
 if [ $install = "all" ]
 then
+    . ./nginx.sh
+    . ./redis.sh
     . ./opentox-webservices.sh
-    . ./mysql-setup.sh
+    #. ./mysql-setup.sh
     echo "Starting Nginx"
     echo "Please inspect and tune /opt/nginx/conf/nginx.conf and /home/opentox/.opentox/config/production.yaml"
     /opt/nginx/sbin/nginx
diff --git a/nginx.conf b/nginx.conf
index add5f85..f2c9bed 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -8,8 +8,8 @@ http {
 
     server_names_hash_bucket_size  256;
 
-    passenger_root /opt/ruby-enterprise-1.8.7-2010.02/lib/ruby/gems/1.8/gems/PASSENGER;
-    passenger_ruby /opt/ruby-enterprise-1.8.7-2010.02/bin/ruby;
+    passenger_root /opt/ruby-enterprise-1.8.7-2010.03/lib/ruby/gems/1.8/gems/PASSENGER;
+    passenger_ruby /opt/ruby-enterprise-1.8.7-2010.03/bin/ruby;
     passenger_default_user opentox;
     passenger_log_level 3;
 
diff --git a/nginx.sh b/nginx.sh
index b41636f..09eebee 100644
--- a/nginx.sh
+++ b/nginx.sh
@@ -3,7 +3,7 @@
 . /etc/profile
 passenger-install-nginx-module --auto-download --auto --prefix=/opt/nginx
 
-cd /opt/ruby-enterprise-1.8.7-2010.02/lib/ruby/gems/1.8/gems/
+cd /opt/ruby-enterprise-1.8.7-2010.03/lib/ruby/gems/1.8/gems/
 passenger=`ls -d passenger*`;
 cd -
 servername=`hostname`.`dnsdomainname`
diff --git a/ruby.sh b/ruby.sh
index 110d0cb..48e90af 100644
--- a/ruby.sh
+++ b/ruby.sh
@@ -2,10 +2,10 @@
 
 echo "Installing Ruby Enterprise"
 cd /tmp
-wget -O - "http://rubyforge.org/frs/download.php/71096/ruby-enterprise-1.8.7-2010.02.tar.gz" | tar zxv
-ruby-enterprise-1.8.7-2010.02/installer  --dont-install-useful-gems --no-dev-docs --auto=/opt/ruby-enterprise-1.8.7-2010.02
+wget -O - "http://rubyenterpriseedition.googlecode.com/files/ruby-enterprise-1.8.7-2011.03.tar.gz" | tar zxv
+ruby-enterprise-1.8.7-2010.03/installer  --dont-install-useful-gems --no-dev-docs --auto=/opt/ruby-enterprise-1.8.7-2010.03
 sed -i '/^PATH=.*ruby-enterprise/d' /etc/profile
-echo 'PATH=$PATH:/opt/ruby-enterprise-1.8.7-2010.02/bin' | tee -a /etc/profile
+echo 'PATH=$PATH:/opt/ruby-enterprise-1.8.7-2010.03/bin' | tee -a /etc/profile
 . /etc/profile
 gem sources -a http://gemcutter.org 
 gem sources -r http://rubygems.org/