Merge branch 'master' of github.com:helma/opentox-install

Conflicts:
	config
	opentox-ruby.sh

1 files changed, 5 insertions, 2 deletions

diff --git a/opentox-ruby.sh b/opentox-ruby.sh
index 67616c9..595ee36 100644
--- a/opentox-ruby.sh
+++ b/opentox-ruby.sh
@@ -10,6 +10,7 @@ dir=`pwd`
 
 # create config file
 servername=`hostname`.`dnsdomainname`
+escapedservername=`echo $servername|sed 's/\/\\\//'`
 if [ $branch = "development" ]
 then
     logger=":logger: backtrace"
@@ -26,14 +27,16 @@ 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/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
 
 # checkout development version and link lib to opentox-ruby gem
 if [ $branch = "development" ]
 then
     mkdir -p /var/www/opentox
     cd /var/www/opentox
-    git clone http://github.com/mguetlein/opentox-ruby.git 
+    git clone http://github.com/helma/opentox-ruby.git 
     cd opentox-ruby
     git checkout -t origin/$branch
     gem_lib=`gem which opentox-ruby`