From 221ad1ea1042e87fd78492b268b391de619a02a0 Mon Sep 17 00:00:00 2001
From: Roy Lenferink <lenferinkroy@gmail.com>
Date: Mon, 16 Jan 2023 19:41:34 +0100
Subject: [PATCH] Revert MySQL configuration file changes, not needed

---
 data/conf/mysql/my.cnf | 12 ++++++------
 patches-for-podman.sh  |  9 ---------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/data/conf/mysql/my.cnf b/data/conf/mysql/my.cnf
index ccc9fcab..b4c34886 100644
--- a/data/conf/mysql/my.cnf
+++ b/data/conf/mysql/my.cnf
@@ -1,9 +1,3 @@
-[client]
-default-character-set = utf8mb4
-
-[mysql]
-default-character-set = utf8mb4
-
 [mysqld]
 character-set-client-handshake = FALSE
 character-set-server           = utf8mb4
@@ -33,3 +27,9 @@ log-warnings            = 0
 event_scheduler         = 1
 interactive_timeout     = 3610
 wait_timeout            = 3610
+
+[client]
+default-character-set = utf8mb4
+
+[mysql]
+default-character-set = utf8mb4
diff --git a/patches-for-podman.sh b/patches-for-podman.sh
index 711e470a..96ff6f56 100755
--- a/patches-for-podman.sh
+++ b/patches-for-podman.sh
@@ -20,12 +20,3 @@ if ! patch -R -s -f --dry-run docker-compose.yml < ${PATCH_FILE} > /dev/null 2>&
 else
     echo "docker-compose.yml already patched (or custom changes prevent applying the patch)"
 fi
-
-# Patch the MySQL configuration file
-MYCNF_PATH="data/conf/mysql/my.cnf"
-if ! grep "bind_address" ${MYCNF_PATH} > /dev/null 2>&1; then
-    echo "patching file my.cnf"
-    echo "bind_address = 0.0.0.0" >> ${MYCNF_PATH}
-else
-    echo "my.cnf already patched"
-fi