From 9a96e907e737ffa8bd51b7e6cffb24b1db49c83e Mon Sep 17 00:00:00 2001 From: "dave@tiredofit.ca" Date: Wed, 11 Dec 2024 19:35:32 -0800 Subject: [PATCH] Release 7.10.27 - See CHANGELOG.md --- CHANGELOG.md | 6 ++++++ install/assets/functions/00-container | 16 +++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b419c1..baeb831 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 7.10.27 2024-12-11 + + ### Changed + - Set db_ready function to use disable ssl for mysql checks by default + + ## 7.10.23 2024-12-05 ### Added diff --git a/install/assets/functions/00-container b/install/assets/functions/00-container index 3de407d..dba41d9 100755 --- a/install/assets/functions/00-container +++ b/install/assets/functions/00-container @@ -224,7 +224,7 @@ db_ready() { ## Usage db_ready output_off print_debug "Checking to see if Database Type $1 is ready" - case "$1" in + case "${1,,}" in "couch" | "couchdb" ) transform_file_var DB_PORT if [ -n "${DB_PORT}" ] ; then couch_port=${DB_PORT} ; fi ; @@ -277,15 +277,21 @@ db_ready() { print_warn "Mongo Host '${mongo_host}' is not accessible, retrying.. ($counter seconds so far)" done ;; - "mysql" | "mariadb" | "MARIADB" | "MYSQL" ) - if command -v "mysqladmin" &> /dev/null ; then - mysqladmin_bin="$(which mysqladmin)" - elif command -v "mariadb-admin" &> /dev/null ; then + "mysql" | "mariadb" ) + if command -v "mariadb-admin" &> /dev/null ; then mysqladmin_bin="$(which mariadb-admin)" + elif command -v "mysqladmin" &> /dev/null ; then + mysqladmin_bin="$(which mysqladmin)" else print_error "No MySQL or MariaDB client detected - Cannot check for Database" exit 1 fi + if [ ! -f /etc/my.cnf.d/disable-ssl.cnf ] ; then + cat < /etc/my.cnf.d/disable-ssl.cnf +[client] +ssl=FALSE +EOF + fi transform_file_var DB_PORT if [ -n "${DB_PORT}" ] ; then maria_port=${DB_PORT} ; fi ; transform_file_var MYSQL_PORT