From 35c871d873054fb0efcb61de7e52351e17ed8c29 Mon Sep 17 00:00:00 2001
From: Emilien Mantel <emilien.mantel@triplestack.fr>
Date: Mon, 26 Aug 2024 17:37:21 +0200
Subject: [PATCH] :bug: Fix crash on non upstream calls with bad import sql
 file

---
 molecule/debian12_master_slave/converge.yml         | 2 +-
 templates/etc/mysql/mariadb.conf.d/50-server.cnf.j2 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/molecule/debian12_master_slave/converge.yml b/molecule/debian12_master_slave/converge.yml
index 1bc8dd0..c3106d0 100644
--- a/molecule/debian12_master_slave/converge.yml
+++ b/molecule/debian12_master_slave/converge.yml
@@ -11,7 +11,7 @@
 
     - name: COPY | Deploy first dump
       ansible.builtin.copy:
-        src: files/import1.sql
+        src: ../_shared/files/import1.sql
         dest: /tmp/import1.sql
         mode: 0644
         owner: root
diff --git a/templates/etc/mysql/mariadb.conf.d/50-server.cnf.j2 b/templates/etc/mysql/mariadb.conf.d/50-server.cnf.j2
index 4e18f0b..2710998 100644
--- a/templates/etc/mysql/mariadb.conf.d/50-server.cnf.j2
+++ b/templates/etc/mysql/mariadb.conf.d/50-server.cnf.j2
@@ -110,8 +110,8 @@ slow_query_log = 1
 
 # MariaDB default is Latin1, but in Debian we rather default to the full
 # utf8 4-byte character set. See also client.cnf
-character-set-server     = utf8mb4
-character-set-collations = utf8mb4=uca1400_ai_ci
+character-set-server  = utf8mb4
+collation-server      = utf8mb4_general_ci
 
 #
 # * InnoDB