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

Update sql user password string to MYSQL_DB_USER_PASSWORD

Browse Source
This commit is contained in:
Robert Adams
2022-02-06 03:56:37 +00:00
parent 3c3c2acce7
commit 2152b16fd5
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
image-opensim/config/config-standalone-sql/misc.ini
+1 -1
View File
@@ -21,7 +21,7 @@
; Change the connection string to your db details
; NOTE That password comes from environment variables set from os-secrets
StorageProvider = "OpenSim.Data.MySQL.dll"
ConnectionString = "Data Source=MYSQL_DB_SOURCE;Database=opensim;User ID=MYSQL_DB_USER;Password=MYSQL_DB_PASSWORD;Old Guids=true;"
ConnectionString = "Data Source=MYSQL_DB_SOURCE;Database=opensim;User ID=MYSQL_DB_USER;Password=MYSQL_DB_USER_PASSWORD;Old Guids=true;"
[Estates]
; NOTE That names and passwords come from environment variables set from os-secrets
image-opensim/config/config-standalone/misc.ini
+1 -1
View File
@@ -21,7 +21,7 @@
; Change the connection string to your db details
; NOTE That password comes from environment variables set from os-secrets
; StorageProvider = "OpenSim.Data.MySQL.dll"
; ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=OPENSIM_DB_PASSWORD;Old Guids=true;"
; ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=OPENSIM_DB_USER_PASSWORD;Old Guids=true;"
[Estates]
; NOTE That names and passwords come from environment variables set from os-secrets
image-opensim/config/scripts/updateConfigFiles.sh
+6 -5
View File
@@ -22,19 +22,20 @@ for file in $OPENSIMBIN/Regions/*.ini $CONFIGDIR/Regions/*.ini ; do
done
# Add EXTERNAL_HOSTNAME to the common configuation in OpenSim.ini
sed --in-place -e "s/^ *BaseHostname = .*$/ BaseHostname = ${EXTERNAL_HOSTNAME}/" "$OPENSIMBIN/OpenSim.ini"
echo "opensim-docker: updateConfigFiles.sh: fixing BaseHostname in OpenSim.ini"
grep " BaseHostname =" "$OPENSIMBIN/OpenSim.ini"
if [[ -e "$OPENSIMBIN/OpenSim.ini" ]] ; then
sed --in-place -e "s/^ *BaseHostname = .*$/ BaseHostname = ${EXTERNAL_HOSTNAME}/" "$OPENSIMBIN/OpenSim.ini"
echo "opensim-docker: updateConfigFiles.sh: fixing BaseHostname in OpenSim.ini"
grep " BaseHostname =" "$OPENSIMBIN/OpenSim.ini"
fi
# If the environment variables haven't been copied into misc.ini, do it now
echo "opensim-docker: updateConfigFiles.sh: replacing vars in \"${CONFIGDIR}/misc.ini\""
# If the replacement has already happened, this is a NOOP
sed --in-place \
-e "s/MYSQL_DB_USER/$MYSQL_DB_USER/" \
-e "s/MYSQL_DB_USER_PASSWORD/$MYSQL_DB_USER_PASSWORD/" \
-e "s/MYSQL_DB_SOURCE/$MYSQL_DB_SOURCE/" \
-e "s/MYSQL_DB_DB/$MYSQL_DB_DB/" \
-e "s/MYSQL_DB_PASSWORD/$MYSQL_DB_PASSWORD/" \
-e "s/PW_FOR_DEFAULT_ESTATE_OWNER/$PW_FOR_DEFAULT_ESTATE_OWNER/" \
-e "s/DEFAULT_ESTATE_NAME/$DEFAULT_ESTATE_NAME/" \
-e "s/DEFAULT_ESTATE_OWNER/$DEFAULT_ESTATE_OWNER/" \