From 306182dd8d1403adca20b11507c1278847b46a70 Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Mon, 6 Feb 2012 23:05:53 +1000 Subject: Stage two - do the git mv. --- create_region.sh | 110 ------------------------------------------------------- create_sim.sh | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+), 110 deletions(-) delete mode 100755 create_region.sh create mode 100755 create_sim.sh diff --git a/create_region.sh b/create_region.sh deleted file mode 100755 index 8f089fa..0000000 --- a/create_region.sh +++ /dev/null @@ -1,110 +0,0 @@ -#!/bin/bash - -NAME=$1 -LOCATION=$2 -URL=$3 -IP=$4 - -OSPATH="/opt/opensim" -cd $OSPATH/config - -k=0 -for i in $(seq 99) -do - j=$(printf "sim%02d" $i) - if [ -e "$j" ] - then - k=$i - fi -done - -if [ "x$NAME" = "x" ] -then - NAME="No name sim $RANDOM" # Should be unique per grid. - echo "WARNING setting the sim name to [$NAME], this may not be what you want." -fi - -if [ "x$LOCATION" = "x" ] -then - LOCATION="$RANDOM,$RANDOM" # again UNIQUE (i.e. ONLY ONE) per grid in THIS case! - echo "WARNING setting the Location to $LOCATION, this may not be what you want." -fi - -if [ "x$IP" = "x" ] -then - # 0.0.0.0 will work for a single sim per physical machine, otherwise we need the real internal IP. - IP="0.0.0.0" - echo "WARNING setting the InternalAddress to $IP, this may not be what you want." -# echo " 0.0.0.0 will work for a single sim per physical machine, otherwise we need the real internal IP." -# According to the OpenSim docs, 0.0.0.0 means to listen on all NICs the machine has, which should work fine. -fi - -# Here we make use of an external IP finding service. Careful, it may move. -if [ "x$URL" = "x" ] -then - URL=$(wget -q http://automation.whatismyip.com/n09230945.asp -O -) # URL is best (without the HTTP://), but IP (e.g. 88.109.81.55) works too. - echo "WARNING setting the ExternalHostName to $URL, this may not be what you want." -fi - -NUM=$(printf "%02d" $(($k + 1)) ) -PORT=$(( 9005 + ($k * 5) )) # 9002 is used for HTTP/UDP so START with port 9003! CAUTION Diva/D2 starts at port 9000. -UUID=$(uuidgen) - -echo "Creating sim$NUM on port $PORT @ $LOCATION - $NAME." - -mkdir -p sim$NUM/Regions -cd sim$NUM -cat > Regions/sim.ini << zzzzEOFzzzz -[$NAME] -RegionUUID = $UUID -Location = $LOCATION -InternalAddress = $IP -InternalPort = $(( $PORT + 1 )) -AllowAlternatePorts = False -ExternalHostName = $URL -zzzzEOFzzzz - -ln -s ../../setup/start-sim start-sim -cp start-sim stop-sim -cp start-sim backup-sim -cp start-sim sim-console -cp ../../current/bin/OpenSim.exe.config OpenSim.exe.config -sed -i 's@@@' OpenSim.exe.config -sed -i "s@@@" OpenSim.exe.config - -cat > ThisSim.ini << zzzzEOFzzzz -[Startup] - PIDFile = "/var/run/opensim/sim$NUM.pid" - regionload_regionsdir="$OSPATH/config/sim$NUM/Regions" - DecodedSculptMapPath = "caches/sim$NUM/j2kDecodeCache" - -[Network] - console_port = $(( $PORT + 2 )) - http_listener_port = $(( $PORT + 0)) - -[AssetCache] - ;; Damn, this gets overidden later by the FlotsamCache.ini file. - ;; At least it says it can be shared by multiple instances. - ; CacheDirectory = "caches/sim$NUM/assetcache" - -[XEngine] - ScriptEnginesPath = "caches/sim$NUM/ScriptEngines" - -[GridService] - MapTileDirectory = "caches/sim$NUM/maptiles" - -[DataSnapshot] - snapshot_cache_directory = "caches/sim$NUM/DataSnapshot" - -[Includes] - Include-Common = config/common.ini - -zzzzEOFzzzz -cp ../OpenSim.ConsoleClient.ini OpenSim.ConsoleClient.ini -sed -i "s@; port = 9002@port = $(( $PORT + 2 ))@" OpenSim.ConsoleClient.ini - -cp ../../setup/opensim-monit.conf opensim-monit.conf -sed -i "s@sim01@sim$NUM@g" opensim-monit.conf -sudo chown -R opensim:opensim .. -sudo chmod -R g+w .. - diff --git a/create_sim.sh b/create_sim.sh new file mode 100755 index 0000000..8f089fa --- /dev/null +++ b/create_sim.sh @@ -0,0 +1,110 @@ +#!/bin/bash + +NAME=$1 +LOCATION=$2 +URL=$3 +IP=$4 + +OSPATH="/opt/opensim" +cd $OSPATH/config + +k=0 +for i in $(seq 99) +do + j=$(printf "sim%02d" $i) + if [ -e "$j" ] + then + k=$i + fi +done + +if [ "x$NAME" = "x" ] +then + NAME="No name sim $RANDOM" # Should be unique per grid. + echo "WARNING setting the sim name to [$NAME], this may not be what you want." +fi + +if [ "x$LOCATION" = "x" ] +then + LOCATION="$RANDOM,$RANDOM" # again UNIQUE (i.e. ONLY ONE) per grid in THIS case! + echo "WARNING setting the Location to $LOCATION, this may not be what you want." +fi + +if [ "x$IP" = "x" ] +then + # 0.0.0.0 will work for a single sim per physical machine, otherwise we need the real internal IP. + IP="0.0.0.0" + echo "WARNING setting the InternalAddress to $IP, this may not be what you want." +# echo " 0.0.0.0 will work for a single sim per physical machine, otherwise we need the real internal IP." +# According to the OpenSim docs, 0.0.0.0 means to listen on all NICs the machine has, which should work fine. +fi + +# Here we make use of an external IP finding service. Careful, it may move. +if [ "x$URL" = "x" ] +then + URL=$(wget -q http://automation.whatismyip.com/n09230945.asp -O -) # URL is best (without the HTTP://), but IP (e.g. 88.109.81.55) works too. + echo "WARNING setting the ExternalHostName to $URL, this may not be what you want." +fi + +NUM=$(printf "%02d" $(($k + 1)) ) +PORT=$(( 9005 + ($k * 5) )) # 9002 is used for HTTP/UDP so START with port 9003! CAUTION Diva/D2 starts at port 9000. +UUID=$(uuidgen) + +echo "Creating sim$NUM on port $PORT @ $LOCATION - $NAME." + +mkdir -p sim$NUM/Regions +cd sim$NUM +cat > Regions/sim.ini << zzzzEOFzzzz +[$NAME] +RegionUUID = $UUID +Location = $LOCATION +InternalAddress = $IP +InternalPort = $(( $PORT + 1 )) +AllowAlternatePorts = False +ExternalHostName = $URL +zzzzEOFzzzz + +ln -s ../../setup/start-sim start-sim +cp start-sim stop-sim +cp start-sim backup-sim +cp start-sim sim-console +cp ../../current/bin/OpenSim.exe.config OpenSim.exe.config +sed -i 's@@@' OpenSim.exe.config +sed -i "s@@@" OpenSim.exe.config + +cat > ThisSim.ini << zzzzEOFzzzz +[Startup] + PIDFile = "/var/run/opensim/sim$NUM.pid" + regionload_regionsdir="$OSPATH/config/sim$NUM/Regions" + DecodedSculptMapPath = "caches/sim$NUM/j2kDecodeCache" + +[Network] + console_port = $(( $PORT + 2 )) + http_listener_port = $(( $PORT + 0)) + +[AssetCache] + ;; Damn, this gets overidden later by the FlotsamCache.ini file. + ;; At least it says it can be shared by multiple instances. + ; CacheDirectory = "caches/sim$NUM/assetcache" + +[XEngine] + ScriptEnginesPath = "caches/sim$NUM/ScriptEngines" + +[GridService] + MapTileDirectory = "caches/sim$NUM/maptiles" + +[DataSnapshot] + snapshot_cache_directory = "caches/sim$NUM/DataSnapshot" + +[Includes] + Include-Common = config/common.ini + +zzzzEOFzzzz +cp ../OpenSim.ConsoleClient.ini OpenSim.ConsoleClient.ini +sed -i "s@; port = 9002@port = $(( $PORT + 2 ))@" OpenSim.ConsoleClient.ini + +cp ../../setup/opensim-monit.conf opensim-monit.conf +sed -i "s@sim01@sim$NUM@g" opensim-monit.conf +sudo chown -R opensim:opensim .. +sudo chmod -R g+w .. + -- cgit v1.1