Implement per sim ini overrides, closes #23

lickx · Mar 1, 2023 · 6b3704d · 6b3704d
1 parent 7a40784
commit 6b3704d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/bin/simctl b/bin/simctl
@@ -117,6 +117,7 @@ setup() {
     else
         SIM=$1
     fi
+    export SIM
 
     REGION_INIFILE="${OPENSIM_DIR}/etc/sims-available/${SIM}.ini"
 
@@ -181,6 +182,11 @@ do_start() {
         fi
     fi
 
+    # Make local configuration folder for sims if not existing
+    if [ ! -d "${OPENSIM_DIR}/etc/sims-local.d" ]; then
+        mkdir "${OPENSIM_DIR}/etc/sims-local.d"
+    fi
+
     # Change UDP region port to match TCP sim port
     sed -i --follow-symlinks -e "s/InternalPort.*/InternalPort = ${ISTHMUS_PORT}/" "${REGIONS_DIR}/${SIM}.ini"
 

diff --git a/share/system/opensim.ini b/share/system/opensim.ini
@@ -8,6 +8,7 @@ ISTHMUS_PORT=""
 ISTHMUS_PIDFILE=""
 ISTHMUS_LOGFILE=""
 REGION_LOAD_DIR=""
+SIM=""
 
 [Startup]
 regionload_regionsdir="${Environment|REGION_LOAD_DIR}"
@@ -102,4 +103,5 @@ Include-Estates = "../../etc/estate.ini"
 Include-osslEnable = "../../share/system/osslDefaultEnable.ini"
 Include-DatabaseService = "../../etc/database.ini"
 Include-Grid = "../../etc/grid.ini"
+Include-SimLocal = "../../etc/sims-local.d/${Environment|SIM}.ini"
 Include-Local = "../../etc/local.ini"