From 4a35646f3b849e3ccbd1e6138ae06d0c42166d0e Mon Sep 17 00:00:00 2001
From: CrazyMax <1951866+crazy-max@users.noreply.github.com>
Date: Sat, 4 Jan 2025 15:28:03 +0100
Subject: [PATCH] use global conf to skip ssl for mysql client

---
 README.md                           | 1 -
 rootfs/etc/cont-init.d/03-config.sh | 4 ----
 rootfs/etc/my.cnf.d/skip-ssl.cnf    | 2 ++
 3 files changed, 2 insertions(+), 5 deletions(-)
 create mode 100644 rootfs/etc/my.cnf.d/skip-ssl.cnf

diff --git a/README.md b/README.md
index e38f8f6..6e5780c 100644
--- a/README.md
+++ b/README.md
@@ -117,7 +117,6 @@ linux/arm64
 * `DB_PREFIX`: MySQL database prefix (default `flarum_`)
 * `DB_NOPREFIX`: Enforce no prefix for the MySQL database (default `false`)
 * `DB_TIMEOUT`: Time in seconds after which we stop trying to reach the MySQL server (useful for clusters, default `60`)
-* `DB_SKIP_SSL`: Skip SSL connection to MySQL server (default `true`)
 
 > [!NOTE]
 > `DB_USER_FILE` and `DB_PASSWORD_FILE` can be used to fill in the value from a
diff --git a/rootfs/etc/cont-init.d/03-config.sh b/rootfs/etc/cont-init.d/03-config.sh
index cbac299..2cc234d 100644
--- a/rootfs/etc/cont-init.d/03-config.sh
+++ b/rootfs/etc/cont-init.d/03-config.sh
@@ -62,7 +62,6 @@ DB_USER=${DB_USER:-flarum}
 DB_PREFIX=${DB_PREFIX:-flarum_}
 DB_NOPREFIX=${DB_NOPREFIX:-false}
 DB_TIMEOUT=${DB_TIMEOUT:-60}
-DB_SKIP_SSL=${DB_SKIP_SSL:-true}
 
 # Timezone
 echo "Setting timezone to ${TZ}..."
@@ -127,9 +126,6 @@ if [ -z "$DB_PASSWORD" ]; then
   exit 1
 fi
 dbcmd="mariadb -h ${DB_HOST} -P ${DB_PORT} -u "${DB_USER}" "-p${DB_PASSWORD}""
-if [ "$DB_SKIP_SSL" = "true" ]; then
-  dbcmd="$dbcmd --skip-ssl"
-fi
 
 echo "Waiting ${DB_TIMEOUT}s for database to be ready..."
 counter=1
diff --git a/rootfs/etc/my.cnf.d/skip-ssl.cnf b/rootfs/etc/my.cnf.d/skip-ssl.cnf
new file mode 100644
index 0000000..bcb4270
--- /dev/null
+++ b/rootfs/etc/my.cnf.d/skip-ssl.cnf
@@ -0,0 +1,2 @@
+[client]
+skip-ssl = true