--- trunk/bin/cloud.sh 2009/09/26 12:32:30 82 +++ trunk/bin/cloud.sh 2009/09/26 12:33:04 83 @@ -2,14 +2,14 @@ port=4000 offset=0 -limit=25000 +limit=1000 connect= v= #v='-v' -v='-C -v' -limit=1000 +#v='-C -v' +v='-C' hostname=`hostname -s` @@ -19,19 +19,23 @@ function node { + echo 0 exit | nc -w 0 localhost $port + if [ ! -z "$update" ] ; then echo "# update $1:$2 from $prefix" rsync -rav --exclude 'out/*' $prefix/srv/Sack/ $1:/$2/srv/Sack/ rsync -rav --exclude 'out/*' --exclude 'var/*' $prefix/srv/webpac2/ $1:/$2/srv/webpac2/ - ssh $1 $2/srv/Sack/bin/install-debian.sh || exit - return + ssh -f $1 $2/srv/Sack/bin/install-debian.sh fi - ssh="ssh $v -S /tmp/sack.$1.ssh -L $port:127.0.0.1:$port $1" - test "$hostname" == $1 && ssh="" + ssh="ssh $v -f -S /tmp/sack.$1.ssh -L $port:127.0.0.1:$port $1" - echo 0 exit | nc localhost $port - ssh $1 "echo 0 exit | nc 127.0.0.1 $port ; killall sack.pl" + if [ "$hostname" == $1 ] ; then + ssh="" + + ssh $1 "echo 0 exit | nc 127.0.0.1 $port ; killall sack.pl" + ssh -S /tmp/sack.$1.ssh -O exit $1 + fi full="$ssh $2/srv/Sack/bin/sack.pl --listen $port --limit $limit --offset $offset" echo "# node $1 # $full" @@ -57,16 +61,17 @@ node t61p / else echo "# .lib"; - node mlin /virtual/webpac2.rot13.org/export/ - node mlin /virtual/webpac2.rot13.org/export/ - node opr /virtual/webpac2.rot13.org/export/ - node opr /virtual/webpac2.rot13.org/export/ + DISPLAY= +# limit=24000 + mlin=10.60.0.93 + opr=10.60.0.91 + node $mlin /virtual/webpac2.rot13.org/export/ + node $mlin /virtual/webpac2.rot13.org/export/ + node $opr /virtual/webpac2.rot13.org/export/ + node $opr /virtual/webpac2.rot13.org/export/ node klin /virtual/webpac2.rot13.org/export/ fi -test ! -z "$update" && exit - echo "## lorry wating..." -sleep 1 -echo "## ... $connect"; + cd $prefix/srv/Sack ; ./bin/sack.pl $connect --limit $limit --offset $offset