Rename the configuration directories to "config-${CONFIG_NAME}"

to make the configuration directories clearer and easier to understand.

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.

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"
 

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"

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}"

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"

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\""