diff options
| author | David Vorgrimmler <vorgrimmlerdavid@gmx.de> | 2012-04-20 15:46:56 +0200 |
|---|---|---|
| committer | David Vorgrimmler <vorgrimmlerdavid@gmx.de> | 2012-04-20 15:46:56 +0200 |
| commit | 1267aa7feda75a2fcdcaae6761fd9b658520b786 (patch) | |
| tree | 2651b226e0725001b8f6a88f5d1f27a9a947556d /ot-tools-root.sh | |
| parent | 8b4eecca7381c8c6fa4e941227058054e40dedf2 (diff) | |
| parent | d7c43e8399c64acbc02ce31eb756a347137f0e2c (diff) | |
Merge branch 'development' into pc_unified_from_jl
Diffstat (limited to 'ot-tools-root.sh')
| -rw-r--r-- | ot-tools-root.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ot-tools-root.sh b/ot-tools-root.sh index 7e1233b..064ea29 100644 --- a/ot-tools-root.sh +++ b/ot-tools-root.sh @@ -52,8 +52,8 @@ otupdate() { otstart() { otconfig otkill - sudo bash -c "nohup redis-server $HOME/opentox-ruby/redis-2.2.2/redis.conf >/dev/null 2>&1 &" - sudo bash -c "nohup nginx -c $HOME/opentox-ruby/nginx/conf/nginx.conf >/dev/null 2>&1 &" + sudo bash -c "source $HOME/.opentox-ui.sh; nohup redis-server $HOME/opentox-ruby/redis-*/redis.conf >/dev/null 2>&1 &" + sudo bash -c "source $HOME/.opentox-ui.sh; nohup nginx -c $HOME/opentox-ruby/nginx/conf/nginx.conf >/dev/null 2>&1 &" sleep 2 if ! pgrep -u root nginx>/dev/null 2>&1; then echo "Failed to start nginx."; fi if ! pgrep -u root redis-server>/dev/null 2>&1; then echo "Failed to start redis."; fi @@ -68,14 +68,14 @@ alias ottail='tail -f $HOME/.opentox/log/production.log' # Reload the server otreload() { otconfig - sudo bash -c "nginx -s reload" + sudo bash -c "source $HOME/.opentox-ui.sh; nginx -s reload" } # Kill the server otkill() { otconfig sudo killall -u root nginx >/dev/null 2>&1 - sudo bash -c "redis-cli -p $OHM_PORT shutdown >/dev/null 2>&1" + sudo bash -c "source $HOME/.opentox-ui.sh; redis-cli -p $OHM_PORT shutdown >/dev/null 2>&1" while sudo ps x | grep PassengerWatchdog | grep -v grep >/dev/null 2>&1; do sleep 1; done while sudo ps x | grep Rack | grep -v grep >/dev/null 2>&1; do sleep 1; done for p in `pgrep -u root R 2>/dev/null`; do sudo kill -9 $p; done |