From b972846c5f7abf0deead2876c646c039a60df38a Mon Sep 17 00:00:00 2001
From: onefang
Date: Tue, 13 Aug 2019 03:02:02 +1000
Subject: Make [Region] InternalAddress and ExternalHostName reasonable
 defaults.

Also AllowAlternatePorts isn't actually in the code anywhere, get rid of
it.
---
 bin/OpenSimDefaults.ini                 | 6 ++++++
 example/config/sim_skeleton/ThisSim.ini | 3 ---
 scripts/install/create_sim.sh           | 9 ---------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 0dc565b..a42c831 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -417,6 +417,12 @@
     TelehubAllowLandmark = true
 
 
+; Normally this section goes in the ThisSim.ini file, but this is common for all.
+[Region]
+    InternalAddress = "0.0.0.0"
+    ExternalHostName = "${Const|HostName}"
+
+
 [Map]
     ; Map tile options.
     ; If true, then maptiles are generated using the MapImageModule below.
diff --git a/example/config/sim_skeleton/ThisSim.ini b/example/config/sim_skeleton/ThisSim.ini
index db3cf94..44749bb 100644
--- a/example/config/sim_skeleton/ThisSim.ini
+++ b/example/config/sim_skeleton/ThisSim.ini
@@ -11,10 +11,7 @@
     RegionName = "SIM_NAME"
     RegionUUID = "SIM_UUID"
     Location = "SIM_POS"
-    InternalAddress = "SIM_IP"
     InternalPort = "SIM_INT_PORT"
-    AllowAlternatePorts = False
-    ExternalHostName = "${Const|HostName}"
     RegionType = "private sim"
     SizeX = SIM_SIZE
     SizeY = SIM_SIZE
diff --git a/scripts/install/create_sim.sh b/scripts/install/create_sim.sh
index 0aa0941..71aabc7 100755
--- a/scripts/install/create_sim.sh
+++ b/scripts/install/create_sim.sh
@@ -38,14 +38,6 @@ then
     SIZE="256"
 fi
 
-if [ "x${IP}" = "x" ]
-then
-    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
-
 # Wow, the hoops we have to jump through to avoid octal.
 if [ 9 -gt $k ]; then
     NUM=$(printf '0%1s' $(( 10#$k + 1 )) )
@@ -64,7 +56,6 @@ cd sim${NUM}
 sed -i "s@SIM_NAME@${NAME}@g" ThisSim.ini
 sed -i "s@SIM_UUID@${UUID}@g" ThisSim.ini
 sed -i "s@SIM_POS@${LOCATION}@g" ThisSim.ini
-sed -i "s@SIM_IP@${IP}@g" ThisSim.ini
 sed -i "s@SIM_INT_PORT@$(( ${PORT} + 1 ))@g" ThisSim.ini
 sed -i "s@SIM_SIZE@${SIZE}@g" ThisSim.ini
 
-- 
cgit v1.1