summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Maunz <andreas@maunz.de>2012-05-04 13:56:20 +0200
committerAndreas Maunz <andreas@maunz.de>2012-05-04 13:56:20 +0200
commit1e5ea4bb61c69950cccf29990f8dec0e7f23cd96 (patch)
tree26774716e16ecf552c3f77f5121c28276382644c
parent3673d175b95ac3d675f52c19951a9cb6d16a11e7 (diff)
bbrc-sample submodule installbbrc-sample
-rwxr-xr-xconfig.sh4
-rwxr-xr-xopentox-webservices.sh8
2 files changed, 8 insertions, 4 deletions
diff --git a/config.sh b/config.sh
index 8ece62e..5cd42f2 100755
--- a/config.sh
+++ b/config.sh
@@ -22,8 +22,8 @@ REDIS_NUM_VER="2.4.4"
# 4) Server settings.
NGINX_SERVERNAME="toxcreate3.in-silico.ch"
WWW_DEST="$OT_PREFIX/www"
-NGINX_PORT="" # set to empty string ("") for port 80 otherwise set to port *using colon* e.g. ":8080"
-OHM_PORT="6379" # set to port (no colon)
+NGINX_PORT=":8081" # set to empty string ("") for port 80 otherwise set to port *using colon* e.g. ":8080"
+OHM_PORT="6381" # set to port (no colon)
# Done.
diff --git a/opentox-webservices.sh b/opentox-webservices.sh
index 88f864c..f9a85e2 100755
--- a/opentox-webservices.sh
+++ b/opentox-webservices.sh
@@ -60,8 +60,8 @@ done
# fminer etc
cmd="test -f $HOME/.opentox/config/production.yaml" && run_cmd "$cmd" "Config present"
cd "$WWW_DEST/opentox/algorithm" >>$LOG 2>&1
-cmd="$GIT submodule init" && run_cmd "$cmd" "Fminer Init"
-cmd="$GIT submodule update" && run_cmd "$cmd" "Fminer Update"
+cmd="$GIT submodule init" && run_cmd "$cmd" "Submodules init"
+cmd="$GIT submodule update" && run_cmd "$cmd" "Submodules update"
cd "libfminer/libbbrc">>$LOG 2>&1
$GIT checkout $OT_BRANCH>>$LOG 2>&1
$GIT pull >>$LOG 2>&1
@@ -83,6 +83,10 @@ cd - >>$LOG 2>&1
cd "last-utils">>$LOG 2>&1
$GIT checkout $OT_BRANCH>>$LOG 2>&1
$GIT pull >>$LOG 2>&1
+cd - >>$LOG 2>&1
+cd "bbrc-sample">>$LOG 2>&1
+$GIT checkout $OT_BRANCH>>$LOG 2>&1
+$GIT pull >>$LOG 2>&1
cd "$DIR"