Container/fhem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: fixed not setting mysql host when mysql database engine is selected
All checks were successful
continuous-integration/drone Build is passing
Details

Browse Source
This commit is contained in:
Dominik Meyer 2024-06-06 09:04:24 +02:00
parent 6ff9861e6d
commit 385ee40b44
Signed by: byterazor
GPG Key ID: EABDA0FD5981BC97
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
scripts/entryPoint.sh
View File

@ -7,9 +7,14 @@ write_config_file()
DATABASE=$3 DATABASE=$3
USER=$4 USER=$4
PASS=$5 PASS=$5
HOST=$6
if [ -n $HOST ]; then
HOST=";host=${HOST}"
fi
echo '%dbconfig= (' >> $FILE; echo '%dbconfig= (' >> $FILE;
echo " connection => \"${ENGINE}:dbname=${DATABASE}\"," >> $FILE echo " connection => \"${ENGINE}:dbname=${DATABASE}${HOST}\"," >> $FILE
echo " user => \"$USER\"," >> $FILE echo " user => \"$USER\"," >> $FILE
echo " password => \"$PASS\"" >> $FILE echo " password => \"$PASS\"" >> $FILE
echo ');' >> $FILE echo ');' >> $FILE
@ -40,6 +45,10 @@ if [ "${CONFIG_DATABASE_ENGINE}" == "sqlite" ]; then
elif [ "${CONFIG_DATABASE_ENGINE}" == "mysql" ]; then elif [ "${CONFIG_DATABASE_ENGINE}" == "mysql" ]; then
if [ -z ${CONFIG_DATABASE_HOST} ]; then
CONFIG_DATABASE_HOST="localhost"
fi
if [ -z ${CONFIG_DATABASE_USER} ]; then if [ -z ${CONFIG_DATABASE_USER} ]; then
echo "please provide CONFIG_DATABASE_USER " echo "please provide CONFIG_DATABASE_USER "
exit 255 exit 255
@ -50,7 +59,7 @@ elif [ "${CONFIG_DATABASE_ENGINE}" == "mysql" ]; then
exit 255 exit 255
fi fi
write_config_file "${CONFIGDBFILE}" "mysql", "${CONFIG_DATABASE}" "${CONFIG_DATABASE_USER}" "${CONFIG_DATABASE_PASS}" write_config_file "${CONFIGDBFILE}" "mysql", "${CONFIG_DATABASE}" "${CONFIG_DATABASE_USER}" "${CONFIG_DATABASE_PASS}" "${CONFIG_DATABASE_HOST}"
else else
echo "unknown database engine provided in CONFIG_DATABASE_ENGINE" echo "unknown database engine provided in CONFIG_DATABASE_ENGINE"
@ -78,6 +87,10 @@ if [ "${LOG_DATABASE_ENGINE}" == "sqlite" ]; then
elif [ "${LOG_DATABASE_ENGINE}" == "mysql" ]; then elif [ "${LOG_DATABASE_ENGINE}" == "mysql" ]; then
if [ -z ${LOG_DATABASE_HOST} ]; then
CONFIG_DATABASE_HOST="localhost"
fi
if [ -z ${LOG_DATABASE_USER} ]; then if [ -z ${LOG_DATABASE_USER} ]; then
echo "please provide LOG_DATABASE_USER " echo "please provide LOG_DATABASE_USER "
exit 255 exit 255
@ -88,7 +101,7 @@ elif [ "${LOG_DATABASE_ENGINE}" == "mysql" ]; then
exit 255 exit 255
fi fi
write_config_file "${LOGDBFILE}" "mysql" "${LOG_DATABASE}" "${LOG_DATABASE_USER}" "${LOG_DATABASE_PASS}" write_config_file "${LOGDBFILE}" "mysql" "${LOG_DATABASE}" "${LOG_DATABASE_USER}" "${LOG_DATABASE_PASS}" "${LOG_DATABASE_HOST}"
else else
echo "unknown database engine provided in LOG_DATABASE_ENGINE" echo "unknown database engine provided in LOG_DATABASE_ENGINE"