Release 7.10.27 - See CHANGELOG.md

tiredofit · Dec 12, 2024 · 9a96e90 · 9a96e90
1 parent bbdd7f1
commit 9a96e90
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 7.10.27 2024-12-11 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Set db_ready function to use disable ssl for mysql checks by default
+
+
 ## 7.10.23 2024-12-05 <dave at tiredofit dot ca>
 
    ### Added

diff --git a/install/assets/functions/00-container b/install/assets/functions/00-container
@@ -224,7 +224,7 @@ db_ready() {
     ## Usage db_ready <dbtype>
     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 <<EOF > /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