admin/opensim-docker
1
0
Fork 0
mirror of https://github.com/Misterblue/opensim-docker.git synced 2026-07-29 19:03:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change the config parameter OPENSIM_CONFIGKEY to OS_CONFIGKEY for consistancy.

Browse Source
This commit is contained in:
Robert Adams
2024-08-23 22:19:58 +00:00
parent 0b052102a5
commit 8039d8a3aa
13 changed files with 29 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+2 -2
View File
@@ -92,7 +92,7 @@ Which configuration is used is specified by environment variables which
must be set. The environment variables are:
-- *OS_CONFIG*: the configuration to use (like "standalone" or "standalone-sql")
-- *OPENSIM_CONFIGKEY*: (optional) the password for extracting secrets in .crypt files
-- *OS_CONFIGKEY*: (optional) the password for extracting secrets in .crypt files
The container starts the script `/home/opensim/bootOpenSim.sh` which runs
configuration scripts and then starts the simulator. There are other scripts
@@ -172,7 +172,7 @@ container.
Once the Docker image is built, it can be run with a command like:
```
OS_CONFIG=standalone OPENSIM_CONFIGKEY=secretPassword ./run-opensim.sh
OS_CONFIG=standalone OS_CONFIGKEY=secretPassword ./run-opensim.sh
```
Once started, a `docker ps` will show something like:
image-ncg/config-standalone/os-secrets
+3 -4
View File
@@ -4,18 +4,17 @@
# The configuration files look for the file 'os-secrets.crypt' and, when
# found, runs 'ccrypt' using the password from the environment variable
# "OPENSIM_CONFIGKEY". So, edit this file and do:
# "OS_CONFIGKEY". So, edit this file and do:
# cp os-secrets tempFile
# <edit 'tempFile' adding real passwords>
# ccrypt -e -E "OPENSIM_CONFIGKEY" < tempFile > os-secrets.crypt
# ccrypt -e -E "OS_CONFIGKEY" < tempFile > os-secrets.crypt
# rm tempFile
# or (exposing the key in the bash history):
# ccrypt -e -K thekey < os-secrets > os-secrets.crypt
#
# Later, if you need to review the passwords, decrypt the file with:
# ccrypt -d -E "OPENSIM_CONFIGKEY" < os-secrets.crypt
# ccrypt -d -E "OS_CONFIGKEY" < os-secrets.crypt
# If this next variable is defined, MYSQL is configured
export MYSQL_ROOT_PASSWORD=unknownStuff
export MARIADB_ROOT_PASSWORD=unknownStuff
export MYSQL_DB_HOST=dbservice
image-ncg/config-standalone/scripts/setEnvironment.sh
+2 -2
View File
@@ -11,11 +11,11 @@ cd "$OPENSIMCONFIG"
# See if we have encrypted secrets
unset HAVE_SECRETS
if [[ ! -z "$OPENSIM_CONFIGKEY" ]] ; then
if [[ ! -z "$OS_CONFIGKEY" ]] ; then
for secretsFile in $OPENSIMCONFIG/os-secrets.crypt ; do
if [[ -e "$secretsFile" ]] ; then
echo "opensim-docker: setEnvironment.sh: have secrets file \"{$secretsFile}\""
source <(ccrypt -c -E OPENSIM_CONFIGKEY "$secretsFile")
source <(ccrypt -c -E OS_CONFIGKEY "$secretsFile")
HAVE_SECRETS=yes
break;
else
image-opensim-herbal3d/config-osgrid/os-secrets
+3 -4
View File
@@ -4,18 +4,17 @@
# The configuration files look for the file 'os-secrets.crypt' and, when
# found, runs 'ccrypt' using the password from the environment variable
# "OPENSIM_CONFIGKEY". So, edit this file and do:
# "OS_CONFIGKEY". So, edit this file and do:
# cp os-secrets tempFile
# <edit 'tempFile' adding real passwords>
# ccrypt -e -E "OPENSIM_CONFIGKEY" < tempFile > os-secrets.crypt
# ccrypt -e -E "OS_CONFIGKEY" < tempFile > os-secrets.crypt
# rm tempFile
# or (exposing the key in the bash history):
# ccrypt -e -K thekey < os-secrets > os-secrets.crypt
#
# Later, if you need to review the passwords, decrypt the file with:
# ccrypt -d -E "OPENSIM_CONFIGKEY" < os-secrets.crypt
# ccrypt -d -E "OS_CONFIGKEY" < os-secrets.crypt
# If this next variable is defined, MYSQL is configured
export MYSQL_ROOT_PASSWORD=unknownStuff
export MARIADB_ROOT_PASSWORD=unknownStuff
export MYSQL_DB_HOST=dbservice
image-opensim-herbal3d/config-osgrid/scripts/setEnvironment.sh
+2 -2
View File
@@ -11,11 +11,11 @@ cd "$OPENSIMCONFIG"
# See if we have encrypted secrets
unset HAVE_SECRETS
if [[ ! -z "$OPENSIM_CONFIGKEY" ]] ; then
if [[ ! -z "$OS_CONFIGKEY" ]] ; then
for secretsFile in $OPENSIMCONFIG/os-secrets.crypt ; do
if [[ -e "$secretsFile" ]] ; then
echo "opensim-docker: setEnvironment.sh: have secrets file \"{$secretsFile}\""
source <(ccrypt -c -E OPENSIM_CONFIGKEY "$secretsFile")
source <(ccrypt -c -E OS_CONFIGKEY "$secretsFile")
HAVE_SECRETS=yes
break;
else
image-opensim-herbal3d/config-standalone/os-secrets
+3 -4
View File
@@ -4,18 +4,17 @@
# The configuration files look for the file 'os-secrets.crypt' and, when
# found, runs 'ccrypt' using the password from the environment variable
# "OPENSIM_CONFIGKEY". So, edit this file and do:
# "OS_CONFIGKEY". So, edit this file and do:
# cp os-secrets tempFile
# <edit 'tempFile' adding real passwords>
# ccrypt -e -E "OPENSIM_CONFIGKEY" < tempFile > os-secrets.crypt
# ccrypt -e -E "OS_CONFIGKEY" < tempFile > os-secrets.crypt
# rm tempFile
# or (exposing the key in the bash history):
# ccrypt -e -K thekey < os-secrets > os-secrets.crypt
#
# Later, if you need to review the passwords, decrypt the file with:
# ccrypt -d -E "OPENSIM_CONFIGKEY" < os-secrets.crypt
# ccrypt -d -E "OS_CONFIGKEY" < os-secrets.crypt
# If this next variable is defined, MYSQL is configured
export MYSQL_ROOT_PASSWORD=unknownStuff
export MARIADB_ROOT_PASSWORD=unknownStuff
export MYSQL_DB_HOST=dbservice
image-opensim-herbal3d/config-standalone/scripts/setEnvironment.sh
+2 -2
View File
@@ -11,11 +11,11 @@ cd "$OPENSIMCONFIG"
# See if we have encrypted secrets
unset HAVE_SECRETS
if [[ ! -z "$OPENSIM_CONFIGKEY" ]] ; then
if [[ ! -z "$OS_CONFIGKEY" ]] ; then
for secretsFile in $OPENSIMCONFIG/os-secrets.crypt ; do
if [[ -e "$secretsFile" ]] ; then
echo "opensim-docker: setEnvironment.sh: have secrets file \"{$secretsFile}\""
source <(ccrypt -c -E OPENSIM_CONFIGKEY "$secretsFile")
source <(ccrypt -c -E OS_CONFIGKEY "$secretsFile")
HAVE_SECRETS=yes
break;
else
image-opensim/config-osgrid/os-secrets
+3 -4
View File
@@ -4,18 +4,17 @@
# The configuration files look for the file 'os-secrets.crypt' and, when
# found, runs 'ccrypt' using the password from the environment variable
# "OPENSIM_CONFIGKEY". So, edit this file and do:
# "OS_CONFIGKEY". So, edit this file and do:
# cp os-secrets tempFile
# <edit 'tempFile' adding real passwords>
# ccrypt -e -E "OPENSIM_CONFIGKEY" < tempFile > os-secrets.crypt
# ccrypt -e -E "OS_CONFIGKEY" < tempFile > os-secrets.crypt
# rm tempFile
# or (exposing the key in the bash history):
# ccrypt -e -K thekey < os-secrets > os-secrets.crypt
#
# Later, if you need to review the passwords, decrypt the file with:
# ccrypt -d -E "OPENSIM_CONFIGKEY" < os-secrets.crypt
# ccrypt -d -E "OS_CONFIGKEY" < os-secrets.crypt
# If this next variable is defined, MYSQL is configured
export MYSQL_ROOT_PASSWORD=unknownStuff
export MARIADB_ROOT_PASSWORD=unknownStuff
export MYSQL_DB_HOST=dbservice
image-opensim/config-osgrid/scripts/setEnvironment.sh
+2 -2
View File
@@ -11,11 +11,11 @@ cd "$OPENSIMCONFIG"
# See if we have encrypted secrets
unset HAVE_SECRETS
if [[ ! -z "$OPENSIM_CONFIGKEY" ]] ; then
if [[ ! -z "$OS_CONFIGKEY" ]] ; then
for secretsFile in $OPENSIMCONFIG/os-secrets.crypt ; do
if [[ -e "$secretsFile" ]] ; then
echo "opensim-docker: setEnvironment.sh: have secrets file \"{$secretsFile}\""
source <(ccrypt -c -E OPENSIM_CONFIGKEY "$secretsFile")
source <(ccrypt -c -E OS_CONFIGKEY "$secretsFile")
HAVE_SECRETS=yes
break;
else
image-opensim/config-standalone/os-secrets
+3 -4
View File
@@ -4,18 +4,17 @@
# The configuration files look for the file 'os-secrets.crypt' and, when
# found, runs 'ccrypt' using the password from the environment variable
# "OPENSIM_CONFIGKEY". So, edit this file and do:
# "OS_CONFIGKEY". So, edit this file and do:
# cp os-secrets tempFile
# <edit 'tempFile' adding real passwords>
# ccrypt -e -E "OPENSIM_CONFIGKEY" < tempFile > os-secrets.crypt
# ccrypt -e -E "OS_CONFIGKEY" < tempFile > os-secrets.crypt
# rm tempFile
# or (exposing the key in the bash history):
# ccrypt -e -K thekey < os-secrets > os-secrets.crypt
#
# Later, if you need to review the passwords, decrypt the file with:
# ccrypt -d -E "OPENSIM_CONFIGKEY" < os-secrets.crypt
# ccrypt -d -E "OS_CONFIGKEY" < os-secrets.crypt
# If this next variable is defined, MYSQL is configured
export MYSQL_ROOT_PASSWORD=unknownStuff
export MARIADB_ROOT_PASSWORD=unknownStuff
export MYSQL_DB_HOST=dbservice
image-opensim/config-standalone/scripts/setEnvironment.sh
+2 -2
View File
@@ -11,11 +11,11 @@ cd "$OPENSIMCONFIG"
# See if we have encrypted secrets
unset HAVE_SECRETS
if [[ ! -z "$OPENSIM_CONFIGKEY" ]] ; then
if [[ ! -z "$OS_CONFIGKEY" ]] ; then
for secretsFile in $OPENSIMCONFIG/os-secrets.crypt ; do
if [[ -e "$secretsFile" ]] ; then
echo "opensim-docker: setEnvironment.sh: have secrets file \"{$secretsFile}\""
source <(ccrypt -c -E OPENSIM_CONFIGKEY "$secretsFile")
source <(ccrypt -c -E OS_CONFIGKEY "$secretsFile")
HAVE_SECRETS=yes
break;
else
run-scripts/README.md
+1 -1
View File
@@ -11,7 +11,7 @@ to the image-* directory.
for seeing that the configuration files and other setup (like DB) are initialized.
This script calls `firstTimeSetup.sh` for the first ever boot to do any
initial setup.
This script will fail if the environment variables `CONFIGKEY` or `EXTERNAL_HOSTNAME`
This script will fail if the environment variables `OS_CONFIGKEY` or `EXTERNAL_HOSTNAME`
are not set.
`run.opensim.sh` starts the OpenSimulator instance.
run-scripts/bootOpenSim.sh
+1 -1
View File
@@ -6,7 +6,7 @@
# The environment variable CONFIG_NAME can be set here otherwise
# the value in config/os-config is used
# If os-secrets.crypt exists in the configuration, the environment
# variable CONFIGKEY must exist and be the password for the encrypted file
# variable OS_CONFIGKEY must exist and be the password for the encrypted file
export OPENSIMHOME=/home/opensim
export VERSIONDIR=$OPENSIMHOME/VERSION