Move the example sim to a sim skeleton, suitable for scripting.

5 files changed, 26 insertions, 22 deletions

diff --git a/config/sim01/My_sim.xml b/config/sim01/My_sim.xml
deleted file mode 100644
index 2f893ad..0000000
--- a/config/sim01/My_sim.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Nini>
-  <Section Name="My sim">
-    <Key Name="RegionUUID" Value="ffffffff-ffff-ffff-ffff-ffffffffffff" />
-    <Key Name="Location" Value="10000,10000" />
-    <Key Name="InternalAddress" Value="0.0.0.0" />
-    <Key Name="InternalPort" Value="9106" />
-    <Key Name="AllowAlternatePorts" Value="False" />
-    <Key Name="ExternalHostName" Value="SYSTEMIP" />
-    <Key Name="RegionType" Value="private sim" />
-    <Key Name="SizeX" Value="256" />
-    <Key Name="SizeY" Value="256" />
-  </Section>
-</Nini>
diff --git a/config/sim01/ThisSim.ini b/config/sim01/ThisSim.ini
deleted file mode 100644
index e7953ab..0000000
--- a/config/sim01/ThisSim.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[Startup]
-    PIDFile = "/var/run/opensim/sim01.pid"
-    regionload_regionsdir="/opt/opensim/config/sim01"
-
-[Network]
-    http_listener_port = 9105
diff --git a/config/sim_skeleton/My_sim.xml b/config/sim_skeleton/My_sim.xml
new file mode 100644
index 0000000..c5723f3
--- /dev/null
+++ b/config/sim_skeleton/My_sim.xml
@@ -0,0 +1,13 @@
+<Nini>
+  <Section Name="SIM_NAME">
+    <Key Name="RegionUUID" Value="SIM_UUID" />
+    <Key Name="Location" Value="SIM_POS" />
+    <Key Name="InternalAddress" Value="SIM_IP" />
+    <Key Name="InternalPort" Value="SIM_INT_PORT" />
+    <Key Name="AllowAlternatePorts" Value="False" />
+    <Key Name="ExternalHostName" Value="SIM_URL" />
+    <Key Name="RegionType" Value="private sim" />
+    <Key Name="SizeX" Value="SIM_SIZE" />
+    <Key Name="SizeY" Value="SIM_SIZE" />
+  </Section>
+</Nini>
diff --git a/config/sim_skeleton/ThisSim.ini b/config/sim_skeleton/ThisSim.ini
new file mode 100644
index 0000000..2f691f0
--- /dev/null
+++ b/config/sim_skeleton/ThisSim.ini
@@ -0,0 +1,10 @@
+[Const]
+    mysim="SIM_NUMBER"
+
+[Startup]
+    PIDFile = "/var/run/opensim/sim${Const|mysim}.pid"
+    regionload_regionsdir="/opt/opensim/config/sim${Const|mysim}"
+    LogFile = "../logs/OpenSim_sim${Const|mysim}.log"
+
+[Network]
+    http_listener_port = SIM_PORT
diff --git a/config/sim01/opensim-monit.conf b/config/sim_skeleton/opensim-monit.conf
index 9d66ce6..ac50fc2 100644
--- a/config/sim01/opensim-monit.conf
+++ b/config/sim_skeleton/opensim-monit.conf
@@ -13,10 +13,10 @@
 #
 # Hmmmm, seems that monit changing to a user and running bash -l is different from sudo changing to a user and running bash -l.
 #
-check process sim01 with pidfile /var/run/opensim/sim01.pid
-    start program = "/usr/bin/sudo -Hu opensim /bin/bash -lc 'cd /opt/opensim/config/sim01 && /opt/opensim/config/sim01/start-sim -q'"
+check process simSIM_NUMBER with pidfile /var/run/opensim/simSIM_NUMBER.pid
+    start program = "/usr/bin/sudo -Hu opensim /bin/bash -lc 'cd /opt/opensim/config/simSIM_NUMBER && /opt/opensim/config/simSIM_NUMBER/start-sim -q'"
         as uid root and gid root
-    stop program = "/usr/bin/sudo -Hu opensim /bin/bash -lc 'cd /opt/opensim/config/sim01 && /opt/opensim/config/sim01/stop-sim'" with timeout 600 seconds
+    stop program = "/usr/bin/sudo -Hu opensim /bin/bash -lc 'cd /opt/opensim/config/simSIM_NUMBER && /opt/opensim/config/simSIM_NUMBER/stop-sim'" with timeout 600 seconds
     if cpu usage > 50% for 4 cycles then restart
     if MEMORY usage > 25% for 4 cycles then restart
 #    if 5 restarts within 5 cycles then timeout