From 69fa1d589bce1d6b17ea9948cce3cb80a7f84819 Mon Sep 17 00:00:00 2001
From: Andreas Maunz <andreas@maunz.de>
Date: Wed, 16 Nov 2011 13:47:03 +0100
Subject: Added support for OHM port

---
 config.sh       | 3 ++-
 opentox-ruby.sh | 4 ++--
 production.yaml | 2 ++
 redis.sh        | 4 ++++
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/config.sh b/config.sh
index 9d227ef..9ebd47d 100755
--- a/config.sh
+++ b/config.sh
@@ -22,7 +22,8 @@ REDIS_NUM_VER="2.2.2"
 # 4) Server settings.
 NGINX_SERVERNAME="toxcreate3.in-silico.ch"
 WWW_DEST="$OT_PREFIX/www"
-PORT=":8081" # set to empty string ("") for port 80 otherwise set to port *using colons* e.g. ":8080"
+PORT=":8081" # set to empty string ("") for port 80 otherwise set to port *using colon* e.g. ":8080"
+OHM_PORT="6379" # set to port (no colon)
 
 # Done.
 
diff --git a/opentox-ruby.sh b/opentox-ruby.sh
index 7da9263..f6fa077 100755
--- a/opentox-ruby.sh
+++ b/opentox-ruby.sh
@@ -71,8 +71,8 @@ mkdir -p "$HOME/.opentox/tmp" >>$LOG 2>&1
 $GIT checkout production.yaml      >>$LOG 2>&1
 $GIT checkout aa-$OT_INSTALL.yaml  >>$LOG 2>&1
 
-cmd="sed -e \"s,SERVERNAME,$servername,;s,ESCAPEDSERVER,$escapedserver,;s,LOGGER,$logger,;s,AA,$aa,;s,WWW_DEST,$WWW_DEST,;s,PORT,$PORT,\" production.yaml > $HOME/.opentox/config/production.yaml" && run_cmd "$cmd" "Config 1"
-cmd="sed -e \"s,SERVERNAME,$servername,;s,ESCAPEDSERVER,$escapedserver,;s,LOGGER,$logger,;s,AA,$aa,;s,WWW_DEST,$WWW_DEST,;s,PORT,$PORT,\" aa-$OT_INSTALL.yaml >> $HOME/.opentox/config/production.yaml" && run_cmd "$cmd" "Config 1"
+cmd="sed -e \"s,SERVERNAME,$servername,;s,ESCAPEDSERVER,$escapedserver,;s,LOGGER,$logger,;s,AA,$aa,;s,WWW_DEST,$WWW_DEST,;s,PORT,$PORT,;s,OHM_PORT,$OHM_PORT,\" production.yaml > $HOME/.opentox/config/production.yaml" && run_cmd "$cmd" "Config 1"
+cmd="sed -e \"s,SERVERNAME,$servername,;s,ESCAPEDSERVER,$escapedserver,;s,LOGGER,$logger,;s,AA,$aa,;s,WWW_DEST,$WWW_DEST,;s,PORT,$PORT,;s,OHM_PORT,$OHM_PORT,\" aa-$OT_INSTALL.yaml >> $HOME/.opentox/config/production.yaml" && run_cmd "$cmd" "Config 2"
 
 if [ "$OT_BRANCH" = "development" ] || expr match "$OT_BRANCH" "release"; then
   mkdir -p $WWW_DEST/opentox >>$LOG 2>&1
diff --git a/production.yaml b/production.yaml
index d133cd0..709b133 100644
--- a/production.yaml
+++ b/production.yaml
@@ -17,6 +17,8 @@
   - "webservices.in-silico.ch"
   - "opentox.informatik.uni-freiburg.de"
 
+:ohm_port: OHM_PORT
+
 # Uncomment for verbose logging
 LOGGER
 :logger: debug
diff --git a/redis.sh b/redis.sh
index 2f55539..a670cff 100755
--- a/redis.sh
+++ b/redis.sh
@@ -59,6 +59,10 @@ if ! $REDIS_DONE; then
   if ! grep "save 900 1" $REDIS_SERVER_CONF >>$LOG 2>&1 ; then 
     echo "save 900 1" >> $REDIS_SERVER_CONF 2>$LOG
   fi
+
+  if ! grep "port $OHM_PORT" $REDIS_SERVER_CONF >>$LOG 2>&1 ; then 
+    echo "port $OHM_PORT" >> $REDIS_SERVER_CONF 2>$LOG
+  fi
 fi
 
 if [ ! -f $REDIS_CONF ]; then
-- 
cgit v1.2.3