diff --git a/webtrees/rootfs/etc/cont-init.d/99-run.sh b/webtrees/rootfs/etc/cont-init.d/99-run.sh index a8f65f6f5..833003cab 100755 --- a/webtrees/rootfs/etc/cont-init.d/99-run.sh +++ b/webtrees/rootfs/etc/cont-init.d/99-run.sh @@ -139,24 +139,6 @@ elif [ -f "$DATA_LOCATION"/config.ini.php ]; then sed -i "1a trusted_headers=\"cf-connecting-ip\"" "$DATA_LOCATION"/config.ini.php fi -##################### -# MARIADB DISCOVERY # -##################### - -echo " " -if bashio::services.available 'mysql'; then - bashio::log.green "---" - bashio::log.yellow "MariaDB addon discovered on your system. If you want to use it, you need to use those values when doing the initial startup wizard, or modify manually the config.ini.php file in /config/data (mapped to /addon_configs/xxx-webtrees/data when accessing using a third party tool)" - bashio::log.blue "Host-name : $(bashio::services "mysql" "host")" - bashio::log.blue "Port : $(bashio::services "mysql" "port")" - bashio::log.blue "Database user : $(bashio::services "mysql" "username")" - bashio::log.blue "Database password : $(bashio::services "mysql" "password")" - bashio::log.blue "Database name : webtrees" - bashio::log.blue "Database prefix : wt_" - bashio::log.green "---" -fi -echo " " - ############ # END INFO # ############ @@ -168,6 +150,11 @@ echo "python3 /docker-entrypoint.py" cd /var2/www/webtrees || exit 1 if [ ! -f "${DATA_LOCATION}/config.ini.php" ]; then bashio::log.info "First boot : open the UI at $BASE_URL to access the start-up wizard" + if bashio::services.available 'mysql'; then + bashio::log.info "MariaDB is available, if you want to use it please fill the values seen above in the log" + else + bashio::log.info "As you don't have the MariaDB addon running, you should likely select sqlite as database" + fi python3 /docker-entrypoint.py else bashio::log.info "Webtrees started. You can access your webui at : $BASE_URL"