diff options
| -rw-r--r-- | debian.sh | 3 | ||||
| -rw-r--r-- | mysql-setup.sh | 12 | ||||
| -rw-r--r-- | opentox-ruby.sh | 2 | ||||
| -rw-r--r-- | optional.sh | 3 | ||||
| -rw-r--r-- | production.yaml | 8 | ||||
| -rw-r--r-- | redis.sh | 4 |
6 files changed, 5 insertions, 27 deletions
@@ -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 8d31ccd..595ee36 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` escapedservername=`echo $servername|sed 's/\/\\\//'` if [ $branch = "development" ] @@ -28,6 +27,7 @@ fi mkdir -p $HOME/.opentox/config mkdir -p $HOME/.opentox/log +#sed -e "s/SERVERNAME/$servername/;s/LOGGER/$logger/;s/AA/$aa/" production.yaml > $HOME/.opentox/config/production.yaml sed -e "s/PASSWORD/$password/;s/SERVERNAME/$servername/;s/ESCAPEDSERVERNAME/$escapedservername/;s/LOGGER/$logger/;s/AA/$aa/" production.yaml > $HOME/.opentox/config/production.yaml sed -e "s/PASSWORD/$password/;s/SERVERNAME/$servername/;s/ESCAPEDSERVERNAME/$escapedservername/;s/LOGGER/$logger/;s/AA/$aa/" aa-$type.yaml >> $HOME/.opentox/config/production.yaml 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 443c3b5..f6d19cd 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/" @@ -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 |