From 479aa9114a1b59fa36d57a282ae7103d71a56922 Mon Sep 17 00:00:00 2001
From: Robert Adams <misterblue@misterblue.com>
Date: Sat, 5 Feb 2022 20:42:18 +0000
Subject: [PATCH] Rename the configuration directories to
 "config-${CONFIG_NAME}" to make the configuration directories clearer and
 easier to understand.

---
 image-opensim/README.md                                     | 2 +-
 .../{standalone-sql => config-standalone-sql}/Includes.ini  | 0
 .../Regions/Regions.ini                                     | 0
 .../config-include/FlotsamCache.ini                         | 0
 .../config-include/Grid.ini                                 | 0
 .../config-include/GridCommon.ini                           | 0
 .../config-include/GridHypergrid.ini                        | 0
 .../config-include/Standalone.ini                           | 0
 .../config-include/StandaloneCommon.ini                     | 0
 .../config-include/StandaloneHypergrid.ini                  | 0
 .../config-include/osslDefaultEnable.ini                    | 0
 .../config-include/osslEnable.ini                           | 0
 .../config-include/storage/SQLiteStandalone.ini             | 0
 .../docker-compose.yml                                      | 0
 .../{standalone-sql => config-standalone-sql}/misc.ini      | 0
 .../{standalone-sql => config-standalone-sql}/os-secrets    | 0
 .../config/{standalone => config-standalone}/Includes.ini   | 0
 .../{standalone => config-standalone}/Regions/Regions.ini   | 0
 .../config-include/FlotsamCache.ini                         | 0
 .../config-include/Grid.ini                                 | 0
 .../config-include/GridCommon.ini                           | 0
 .../config-include/GridHypergrid.ini                        | 0
 .../config-include/Standalone.ini                           | 0
 .../config-include/StandaloneCommon.ini                     | 0
 .../config-include/StandaloneHypergrid.ini                  | 0
 .../config-include/osslDefaultEnable.ini                    | 0
 .../config-include/osslEnable.ini                           | 0
 .../config-include/storage/SQLiteStandalone.ini             | 0
 .../{standalone => config-standalone}/docker-compose.yml    | 0
 .../config/{standalone => config-standalone}/misc.ini       | 0
 .../config/{standalone => config-standalone}/os-secrets     | 0
 image-opensim/config/scripts/initializeDb.sh                | 4 ++--
 image-opensim/config/scripts/setEnvironment.sh              | 4 ++--
 image-opensim/config/setup.sh                               | 4 ++--
 image-opensim/run-opensim.sh                                | 6 +++---
 image-opensim/stop-opensim.sh                               | 4 ++--
 36 files changed, 12 insertions(+), 12 deletions(-)
 rename image-opensim/config/{standalone-sql => config-standalone-sql}/Includes.ini (100%)
 rename image-opensim/config/{standalone-sql => config-standalone-sql}/Regions/Regions.ini (100%)
 rename image-opensim/config/{standalone-sql => config-standalone-sql}/config-include/FlotsamCache.ini (100%)
 rename image-opensim/config/{standalone-sql => config-standalone-sql}/config-include/Grid.ini (100%)
 rename image-opensim/config/{standalone-sql => config-standalone-sql}/config-include/GridCommon.ini (100%)
 rename image-opensim/config/{standalone-sql => config-standalone-sql}/config-include/GridHypergrid.ini (100%)
 rename image-opensim/config/{standalone-sql => config-standalone-sql}/config-include/Standalone.ini (100%)
 rename image-opensim/config/{standalone-sql => config-standalone-sql}/config-include/StandaloneCommon.ini (100%)
 rename image-opensim/config/{standalone-sql => config-standalone-sql}/config-include/StandaloneHypergrid.ini (100%)
 rename image-opensim/config/{standalone-sql => config-standalone-sql}/config-include/osslDefaultEnable.ini (100%)
 rename image-opensim/config/{standalone-sql => config-standalone-sql}/config-include/osslEnable.ini (100%)
 rename image-opensim/config/{standalone-sql => config-standalone-sql}/config-include/storage/SQLiteStandalone.ini (100%)
 rename image-opensim/config/{standalone-sql => config-standalone-sql}/docker-compose.yml (100%)
 rename image-opensim/config/{standalone-sql => config-standalone-sql}/misc.ini (100%)
 rename image-opensim/config/{standalone-sql => config-standalone-sql}/os-secrets (100%)
 rename image-opensim/config/{standalone => config-standalone}/Includes.ini (100%)
 rename image-opensim/config/{standalone => config-standalone}/Regions/Regions.ini (100%)
 rename image-opensim/config/{standalone => config-standalone}/config-include/FlotsamCache.ini (100%)
 rename image-opensim/config/{standalone => config-standalone}/config-include/Grid.ini (100%)
 rename image-opensim/config/{standalone => config-standalone}/config-include/GridCommon.ini (100%)
 rename image-opensim/config/{standalone => config-standalone}/config-include/GridHypergrid.ini (100%)
 rename image-opensim/config/{standalone => config-standalone}/config-include/Standalone.ini (100%)
 rename image-opensim/config/{standalone => config-standalone}/config-include/StandaloneCommon.ini (100%)
 rename image-opensim/config/{standalone => config-standalone}/config-include/StandaloneHypergrid.ini (100%)
 rename image-opensim/config/{standalone => config-standalone}/config-include/osslDefaultEnable.ini (100%)
 rename image-opensim/config/{standalone => config-standalone}/config-include/osslEnable.ini (100%)
 rename image-opensim/config/{standalone => config-standalone}/config-include/storage/SQLiteStandalone.ini (100%)
 rename image-opensim/config/{standalone => config-standalone}/docker-compose.yml (100%)
 rename image-opensim/config/{standalone => config-standalone}/misc.ini (100%)
 rename image-opensim/config/{standalone => config-standalone}/os-secrets (100%)

diff --git a/image-opensim/README.md b/image-opensim/README.md
index 392f521..023205f 100644
--- a/image-opensim/README.md
+++ b/image-opensim/README.md
@@ -28,7 +28,7 @@ the Docker image is started. `setup.sh` uses `os-config` to define the environme
 variable `CONFIG_NAME` and then uses the information in the same named sub-directory
 to setup the configuration files for [OpenSimulator].
 
-`bin/config/$CONFIG_NAME/Includes.ini` is copied into `bin/config`. This will be read
+`bin/config/config-$CONFIG_NAME/Includes.ini` is copied into `bin/config`. This will be read
 by [OpenSimulator] on startup and replaces all of the usual configuration includes.
 There will usually be a `bin/config/$CONFIG_NAME/config-includes` that models the
 usual [OpenSimulator] configuration directory.
diff --git a/image-opensim/config/standalone-sql/Includes.ini b/image-opensim/config/config-standalone-sql/Includes.ini
similarity index 100%
rename from image-opensim/config/standalone-sql/Includes.ini
rename to image-opensim/config/config-standalone-sql/Includes.ini
diff --git a/image-opensim/config/standalone-sql/Regions/Regions.ini b/image-opensim/config/config-standalone-sql/Regions/Regions.ini
similarity index 100%
rename from image-opensim/config/standalone-sql/Regions/Regions.ini
rename to image-opensim/config/config-standalone-sql/Regions/Regions.ini
diff --git a/image-opensim/config/standalone-sql/config-include/FlotsamCache.ini b/image-opensim/config/config-standalone-sql/config-include/FlotsamCache.ini
similarity index 100%
rename from image-opensim/config/standalone-sql/config-include/FlotsamCache.ini
rename to image-opensim/config/config-standalone-sql/config-include/FlotsamCache.ini
diff --git a/image-opensim/config/standalone-sql/config-include/Grid.ini b/image-opensim/config/config-standalone-sql/config-include/Grid.ini
similarity index 100%
rename from image-opensim/config/standalone-sql/config-include/Grid.ini
rename to image-opensim/config/config-standalone-sql/config-include/Grid.ini
diff --git a/image-opensim/config/standalone-sql/config-include/GridCommon.ini b/image-opensim/config/config-standalone-sql/config-include/GridCommon.ini
similarity index 100%
rename from image-opensim/config/standalone-sql/config-include/GridCommon.ini
rename to image-opensim/config/config-standalone-sql/config-include/GridCommon.ini
diff --git a/image-opensim/config/standalone-sql/config-include/GridHypergrid.ini b/image-opensim/config/config-standalone-sql/config-include/GridHypergrid.ini
similarity index 100%
rename from image-opensim/config/standalone-sql/config-include/GridHypergrid.ini
rename to image-opensim/config/config-standalone-sql/config-include/GridHypergrid.ini
diff --git a/image-opensim/config/standalone-sql/config-include/Standalone.ini b/image-opensim/config/config-standalone-sql/config-include/Standalone.ini
similarity index 100%
rename from image-opensim/config/standalone-sql/config-include/Standalone.ini
rename to image-opensim/config/config-standalone-sql/config-include/Standalone.ini
diff --git a/image-opensim/config/standalone-sql/config-include/StandaloneCommon.ini b/image-opensim/config/config-standalone-sql/config-include/StandaloneCommon.ini
similarity index 100%
rename from image-opensim/config/standalone-sql/config-include/StandaloneCommon.ini
rename to image-opensim/config/config-standalone-sql/config-include/StandaloneCommon.ini
diff --git a/image-opensim/config/standalone-sql/config-include/StandaloneHypergrid.ini b/image-opensim/config/config-standalone-sql/config-include/StandaloneHypergrid.ini
similarity index 100%
rename from image-opensim/config/standalone-sql/config-include/StandaloneHypergrid.ini
rename to image-opensim/config/config-standalone-sql/config-include/StandaloneHypergrid.ini
diff --git a/image-opensim/config/standalone-sql/config-include/osslDefaultEnable.ini b/image-opensim/config/config-standalone-sql/config-include/osslDefaultEnable.ini
similarity index 100%
rename from image-opensim/config/standalone-sql/config-include/osslDefaultEnable.ini
rename to image-opensim/config/config-standalone-sql/config-include/osslDefaultEnable.ini
diff --git a/image-opensim/config/standalone-sql/config-include/osslEnable.ini b/image-opensim/config/config-standalone-sql/config-include/osslEnable.ini
similarity index 100%
rename from image-opensim/config/standalone-sql/config-include/osslEnable.ini
rename to image-opensim/config/config-standalone-sql/config-include/osslEnable.ini
diff --git a/image-opensim/config/standalone-sql/config-include/storage/SQLiteStandalone.ini b/image-opensim/config/config-standalone-sql/config-include/storage/SQLiteStandalone.ini
similarity index 100%
rename from image-opensim/config/standalone-sql/config-include/storage/SQLiteStandalone.ini
rename to image-opensim/config/config-standalone-sql/config-include/storage/SQLiteStandalone.ini
diff --git a/image-opensim/config/standalone-sql/docker-compose.yml b/image-opensim/config/config-standalone-sql/docker-compose.yml
similarity index 100%
rename from image-opensim/config/standalone-sql/docker-compose.yml
rename to image-opensim/config/config-standalone-sql/docker-compose.yml
diff --git a/image-opensim/config/standalone-sql/misc.ini b/image-opensim/config/config-standalone-sql/misc.ini
similarity index 100%
rename from image-opensim/config/standalone-sql/misc.ini
rename to image-opensim/config/config-standalone-sql/misc.ini
diff --git a/image-opensim/config/standalone-sql/os-secrets b/image-opensim/config/config-standalone-sql/os-secrets
similarity index 100%
rename from image-opensim/config/standalone-sql/os-secrets
rename to image-opensim/config/config-standalone-sql/os-secrets
diff --git a/image-opensim/config/standalone/Includes.ini b/image-opensim/config/config-standalone/Includes.ini
similarity index 100%
rename from image-opensim/config/standalone/Includes.ini
rename to image-opensim/config/config-standalone/Includes.ini
diff --git a/image-opensim/config/standalone/Regions/Regions.ini b/image-opensim/config/config-standalone/Regions/Regions.ini
similarity index 100%
rename from image-opensim/config/standalone/Regions/Regions.ini
rename to image-opensim/config/config-standalone/Regions/Regions.ini
diff --git a/image-opensim/config/standalone/config-include/FlotsamCache.ini b/image-opensim/config/config-standalone/config-include/FlotsamCache.ini
similarity index 100%
rename from image-opensim/config/standalone/config-include/FlotsamCache.ini
rename to image-opensim/config/config-standalone/config-include/FlotsamCache.ini
diff --git a/image-opensim/config/standalone/config-include/Grid.ini b/image-opensim/config/config-standalone/config-include/Grid.ini
similarity index 100%
rename from image-opensim/config/standalone/config-include/Grid.ini
rename to image-opensim/config/config-standalone/config-include/Grid.ini
diff --git a/image-opensim/config/standalone/config-include/GridCommon.ini b/image-opensim/config/config-standalone/config-include/GridCommon.ini
similarity index 100%
rename from image-opensim/config/standalone/config-include/GridCommon.ini
rename to image-opensim/config/config-standalone/config-include/GridCommon.ini
diff --git a/image-opensim/config/standalone/config-include/GridHypergrid.ini b/image-opensim/config/config-standalone/config-include/GridHypergrid.ini
similarity index 100%
rename from image-opensim/config/standalone/config-include/GridHypergrid.ini
rename to image-opensim/config/config-standalone/config-include/GridHypergrid.ini
diff --git a/image-opensim/config/standalone/config-include/Standalone.ini b/image-opensim/config/config-standalone/config-include/Standalone.ini
similarity index 100%
rename from image-opensim/config/standalone/config-include/Standalone.ini
rename to image-opensim/config/config-standalone/config-include/Standalone.ini
diff --git a/image-opensim/config/standalone/config-include/StandaloneCommon.ini b/image-opensim/config/config-standalone/config-include/StandaloneCommon.ini
similarity index 100%
rename from image-opensim/config/standalone/config-include/StandaloneCommon.ini
rename to image-opensim/config/config-standalone/config-include/StandaloneCommon.ini
diff --git a/image-opensim/config/standalone/config-include/StandaloneHypergrid.ini b/image-opensim/config/config-standalone/config-include/StandaloneHypergrid.ini
similarity index 100%
rename from image-opensim/config/standalone/config-include/StandaloneHypergrid.ini
rename to image-opensim/config/config-standalone/config-include/StandaloneHypergrid.ini
diff --git a/image-opensim/config/standalone/config-include/osslDefaultEnable.ini b/image-opensim/config/config-standalone/config-include/osslDefaultEnable.ini
similarity index 100%
rename from image-opensim/config/standalone/config-include/osslDefaultEnable.ini
rename to image-opensim/config/config-standalone/config-include/osslDefaultEnable.ini
diff --git a/image-opensim/config/standalone/config-include/osslEnable.ini b/image-opensim/config/config-standalone/config-include/osslEnable.ini
similarity index 100%
rename from image-opensim/config/standalone/config-include/osslEnable.ini
rename to image-opensim/config/config-standalone/config-include/osslEnable.ini
diff --git a/image-opensim/config/standalone/config-include/storage/SQLiteStandalone.ini b/image-opensim/config/config-standalone/config-include/storage/SQLiteStandalone.ini
similarity index 100%
rename from image-opensim/config/standalone/config-include/storage/SQLiteStandalone.ini
rename to image-opensim/config/config-standalone/config-include/storage/SQLiteStandalone.ini
diff --git a/image-opensim/config/standalone/docker-compose.yml b/image-opensim/config/config-standalone/docker-compose.yml
similarity index 100%
rename from image-opensim/config/standalone/docker-compose.yml
rename to image-opensim/config/config-standalone/docker-compose.yml
diff --git a/image-opensim/config/standalone/misc.ini b/image-opensim/config/config-standalone/misc.ini
similarity index 100%
rename from image-opensim/config/standalone/misc.ini
rename to image-opensim/config/config-standalone/misc.ini
diff --git a/image-opensim/config/standalone/os-secrets b/image-opensim/config/config-standalone/os-secrets
similarity index 100%
rename from image-opensim/config/standalone/os-secrets
rename to image-opensim/config/config-standalone/os-secrets
diff --git a/image-opensim/config/scripts/initializeDb.sh b/image-opensim/config/scripts/initializeDb.sh
index fdb3e99..8ebdb7e 100755
--- a/image-opensim/config/scripts/initializeDb.sh
+++ b/image-opensim/config/scripts/initializeDb.sh
@@ -22,8 +22,8 @@ if [[ ! -z "$MYSQL_ROOT_PASSWORD" ]] ; then
         fi
     done
 
-    SQLCMDS=${OPENSIMCONFIG}/mymy$$
-    SQLOPTIONS=${OPENSIMCONFIG}/mymyoptions$$
+    SQLCMDS=/tmp/mymy$$
+    SQLOPTIONS=tmp/mymyoptions$$
     rm -f "$SQLCMDS"
     rm -f "$SQLOPTIONS"
 
diff --git a/image-opensim/config/scripts/setEnvironment.sh b/image-opensim/config/scripts/setEnvironment.sh
index 8a0d62a..c2b49d8 100755
--- a/image-opensim/config/scripts/setEnvironment.sh
+++ b/image-opensim/config/scripts/setEnvironment.sh
@@ -20,7 +20,7 @@ fi
 # See if we have encrypted secrets
 unset HAVE_SECRETS
 if [[ ! -z "$CONFIGKEY" ]] ; then
-    for secretsFile in $OPENSIMCONFIG/$CONFIG_NAME/os-secrets.crypt $OPENSIMCONFIG/os-secrets.crypt ; do
+    for secretsFile in $OPENSIMCONFIG/config-${CONFIG_NAME}/os-secrets.crypt $OPENSIMCONFIG/os-secrets.crypt ; do
         if [[ -e "$secretsFile" ]] ; then
             echo "opensim-docker: setEnvironment.sh: have secrets file \"{$secretsFile}\""
             source <(ccrypt -c -E CONFIGKEY "$secretsFile")
@@ -35,7 +35,7 @@ fi
 # If no encrypted secrets, maybe unsecure plain-text secrets are available
 if [[ -z "$HAVE_SECRETS" ]] ; then
     echo "opensim-docker: setEnvironment.sh: trying plain text secrets"
-    for secretsFile in $OPENSIMCONFIG/$CONFIG_NAME/os-secrets $OPENSIMCONFIG/os-secrets ; do
+    for secretsFile in $OPENSIMCONFIG/config-${CONFIG_NAME}/os-secrets $OPENSIMCONFIG/os-secrets ; do
         if [[ -e "$secretsFile" ]] ; then
             echo "opensim-docker: setEnvironment.sh: plain text secrets from \"${secretsFile}\""
             source "$secretsFile"
diff --git a/image-opensim/config/setup.sh b/image-opensim/config/setup.sh
index 72d827d..919307e 100755
--- a/image-opensim/config/setup.sh
+++ b/image-opensim/config/setup.sh
@@ -31,9 +31,9 @@ fi
 # Since all the regular configuration has been nulled out, this will be the only config
 #    after bin/OpenSimDefaults.ini and bin/OpenSim.ini
 cd "$CONFIGDIR"
-if [[ -e "${CONFIG_NAME}/Includes.ini" ]] ; then
+if [[ -e "config-${CONFIG_NAME}/Includes.ini" ]] ; then
     echo "opensim-docker: setup.sh: Copying \"${CONFIG_NAME}/Includes.ini\""
-    cp "${CONFIG_NAME}/Includes.ini" .
+    cp "config-${CONFIG_NAME}/Includes.ini" .
 fi
 
 echo "opensim-docker: setup.sh: CONFIG_NAME=${CONFIG_NAME}"
diff --git a/image-opensim/run-opensim.sh b/image-opensim/run-opensim.sh
index 7b4f665..ed37493 100755
--- a/image-opensim/run-opensim.sh
+++ b/image-opensim/run-opensim.sh
@@ -31,13 +31,13 @@ unset OPENSIMBIN
 # Use the generic docker-compose file or the one specific to the configuration if it exists
 cd "$BASE"
 COMPOSEFILE=./docker-compose.yml
-if [[ -e "config/$CONFIG_NAME/docker-compose.yml" ]] ; then
-    COMPOSEFILE="config/$CONFIG_NAME/docker-compose.yml"
+if [[ -e "config/config-${CONFIG_NAME}/docker-compose.yml" ]] ; then
+    COMPOSEFILE="config/config-${CONFIG_NAME}/docker-compose.yml"
 fi
 
 # Local directory for storage of sql persistant data (so region
 #    contents persists between container restarts).
-# This must be the same directory as in $CONFIG_NAME/docker-compose.yml.
+# This must be the same directory as in config-$CONFIG_NAME/docker-compose.yml.
 if [[ ! -d "$HOME/opensim-sql-data" ]] ; then
     mkdir -p "$HOME/opensim-sql-data"
     chmod o+w "$HOME/opensim-sql-data"
diff --git a/image-opensim/stop-opensim.sh b/image-opensim/stop-opensim.sh
index c2f6e5e..e7eb0a8 100755
--- a/image-opensim/stop-opensim.sh
+++ b/image-opensim/stop-opensim.sh
@@ -14,8 +14,8 @@ unset OPENSIMBIN
 # Use the generic docker-compose file or the one specific to the configuration if it exists
 cd "$BASE"
 COMPOSEFILE=./docker-compose.yml
-if [[ -e "config/$CONFIG_NAME/docker-compose.yml" ]] ; then
-    COMPOSEFILE="config/$CONFIG_NAME/docker-compose.yml"
+if [[ -e "config/config-${CONFIG_NAME}/docker-compose.yml" ]] ; then
+    COMPOSEFILE="config/config-${CONFIG_NAME}/docker-compose.yml"
 fi
 
 echo "Stopping configuration $CONFIG_NAME from \"$COMPOSEFILE\""