From c6c57b1ef623b58de0bfe6402f056218d4dcbd69 Mon Sep 17 00:00:00 2001
From: Christoph Helma <helma@in-silico.ch>
Date: Mon, 7 Mar 2011 19:46:58 +0100
Subject: mysql installation removed

---
 config          | 11 +----------
 debian.sh       |  3 ---
 mysql-setup.sh  | 12 ------------
 opentox-ruby.sh |  3 +--
 optional.sh     |  3 ---
 production.yaml |  8 --------
 redis.sh        |  4 ++++
 7 files changed, 6 insertions(+), 38 deletions(-)
 delete mode 100644 mysql-setup.sh
 delete mode 100644 optional.sh

diff --git a/config b/config
index 6ff7cee..cada2e2 100644
--- a/config
+++ b/config
@@ -5,18 +5,9 @@
 # Linux distribution (currently only debian)
 distribution=debian
 
-# Choose a root password for the MySQL database
-# Please insert the correct password if mysql-server is already installed
-mysql_root=opentox
-
-# Services to be installed
-# Options:
-# gem	Installs only the opentox-ruby gem (useful, if you want to use external services with the opentox-ruby DSL)
-# all	Installs all IST/ALU services (useful for local and server installations)
-install=all
-
 # Installation type
 # Options:
+# gem	Installs only the opentox-ruby gem (useful, if you want to use external services with the opentox-ruby DSL)
 # local   local installation
 # server  inter or intranet server
 type=local
diff --git a/debian.sh b/debian.sh
index af1bb76..ed66e39 100644
--- a/debian.sh
+++ b/debian.sh
@@ -12,9 +12,6 @@ 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 # 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
diff --git a/mysql-setup.sh b/mysql-setup.sh
deleted file mode 100644
index 363bdda..0000000
--- a/mysql-setup.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-echo "Initializing MySql"
-. ./config
-password=`grep password /home/opentox/.opentox/config/production.yaml | sed 's/\.*:password://' | tr -d ' '`
-mysql -u root -p$mysql_root << EOF
-  DROP DATABASE IF EXISTS $branch;
-  CREATE DATABASE production;
-  GRANT ALL PRIVILEGES ON production.* TO production@localhost IDENTIFIED BY "$password";
-  FLUSH PRIVILEGES;
-EOF
-
diff --git a/opentox-ruby.sh b/opentox-ruby.sh
index 449b746..67616c9 100644
--- a/opentox-ruby.sh
+++ b/opentox-ruby.sh
@@ -9,7 +9,6 @@ gem install builder # not included by spreadsheet gem
 dir=`pwd`
 
 # create config file
-password=`pwgen 8 1`
 servername=`hostname`.`dnsdomainname`
 if [ $branch = "development" ]
 then
@@ -27,7 +26,7 @@ fi
 
 mkdir -p $HOME/.opentox/config
 mkdir -p $HOME/.opentox/log
-sed -e "s/PASSWORD/$password/;s/SERVERNAME/$servername/;s/LOGGER/$logger/;s/AA/$aa/" production.yaml > $HOME/.opentox/config/production.yaml
+sed -e "s/SERVERNAME/$servername/;s/LOGGER/$logger/;s/AA/$aa/" production.yaml > $HOME/.opentox/config/production.yaml
 
 # checkout development version and link lib to opentox-ruby gem
 if [ $branch = "development" ]
diff --git a/optional.sh b/optional.sh
deleted file mode 100644
index ca33d03..0000000
--- a/optional.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-apt-get install screen vim
diff --git a/production.yaml b/production.yaml
index b1f59de..ce19743 100644
--- a/production.yaml
+++ b/production.yaml
@@ -1,13 +1,5 @@
 :base_dir: /var/www/opentox/
 
-:database: 
-# sqlite3 is not recommended (councurrent write)
-  :adapter:  mysql
-  :database: production
-  :username: production
-  :password: PASSWORD
-  :host:     localhost
-
 :services:
 # make sure to enter a full uri (including training slash)
   opentox-compound:      "http://SERVERNAME/compound/"
diff --git a/redis.sh b/redis.sh
index 9878223..63e2f86 100644
--- a/redis.sh
+++ b/redis.sh
@@ -9,4 +9,8 @@ wget -O - "http://redis.googlecode.com/files/redis-2.2.2.tar.gz" | tar zxv
 cd redis-2.2.2
 make install
 echo "vm.overcommit_memory = 1" >> /etc/sysctl.conf
+mkdir -p /opt/redis
+echo "daemonize yes" > /opt/redis/redis.conf
+echo "dir `pwd`" >> /opt/redis/redis.conf
+edis-server /opt/redis/redis.conf
 cd $dir
-- 
cgit v1.2.3