From e19b7b03659d9c116b6de37c0f005089b679a731 Mon Sep 17 00:00:00 2001
From: Faustin Lammler <faustin@fala.red>
Date: Fri, 25 Jun 2021 09:42:06 +0200
Subject: [PATCH] Upgrading mariadb recreate my.cnf symlink

Upgrading mariadb will recreate my.cnf symlink so it's better to use
mariadb.cnf as the default configuration file.

+ add skip-name-resolve option by default
+ logging option was ignored

squash

s
---
 README.md                               | 6 +++---
 defaults/main.yml                       | 3 ++-
 my.cnf => mariadb.cnf                   | 0
 molecule/default/tests/test_default.py  | 2 +-
 tasks/configure.yml                     | 2 +-
 templates/{my.cnf.j2 => mariadb.cnf.j2} | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)
 rename my.cnf => mariadb.cnf (100%)
 rename templates/{my.cnf.j2 => mariadb.cnf.j2} (100%)

diff --git a/README.md b/README.md
index ca9cafc..643615b 100644
--- a/README.md
+++ b/README.md
@@ -63,16 +63,16 @@ production systems to prevent ansible runs from restarting the MariaDB Server.
 
 To populate the MariaDB Server configuration file, we use almost only raw
 variables. This permits more flexibility and a very simple
-[`templates/my.cnf.j2`](./templates/my.cnf.j2) file.
+[`templates/mariadb.cnf.j2`](./templates/mariadb.cnf.j2) file.
 
 By default, some common and standard options are deployed based on the MariaDB
 Foundation package and it should be easy to change them all (see
-[`my.cnf`](./my.cnf)).
+[`mariadb.cnf`](./mariadb.cnf)).
 
 #### Basic settings
 
 ```yaml
-mariadb_config_file: /etc/mysql/my.cnf
+mariadb_config_file: /etc/mysql/mariadb.cnf
 mariadb_datadir: /var/lib/mysql
 mariadb_port: 3306
 mariadb_bind_address: 127.0.0.1
diff --git a/defaults/main.yml b/defaults/main.yml
index 9cf6281..f477dc0 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -14,7 +14,7 @@ mariadb_can_restart: true
 mariadb_overwrite_global_config_file: true
 
 # MariaDB configuration file
-mariadb_config_file: /etc/mysql/my.cnf
+mariadb_config_file: /etc/mysql/mariadb.cnf
 # Basic settings
 mariadb_datadir: /var/lib/mysql
 mariadb_port: 3306
@@ -44,6 +44,7 @@ mariadb_fine_tuning_raw: |
   bulk_insert_buffer_size = 16M
   tmp_table_size          = 32M
   max_heap_table_size     = 32M
+  skip-name-resolve       = 1
 
 # Query cache
 mariadb_query_cache_raw: |
diff --git a/my.cnf b/mariadb.cnf
similarity index 100%
rename from my.cnf
rename to mariadb.cnf
diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py
index a3fe220..acb3f8f 100644
--- a/molecule/default/tests/test_default.py
+++ b/molecule/default/tests/test_default.py
@@ -29,7 +29,7 @@ def test_mariadb_enabled_and_running(host):
 
 
 def test_ensure_custom_config_is_applied(host):
-    config = host.file("/etc/mysql/my.cnf")
+    config = host.file("/etc/mysql/mariadb.cnf")
     assert config.contains("datadir")
     assert config.user == "root"
     assert config.group == "root"
diff --git a/tasks/configure.yml b/tasks/configure.yml
index cf32810..a558c0f 100644
--- a/tasks/configure.yml
+++ b/tasks/configure.yml
@@ -1,7 +1,7 @@
 ---
 - name: Copy global MariaDB configuration
   template:
-    src: my.cnf.j2
+    src: mariadb.cnf.j2
     dest: "{{ mariadb_config_file }}"
     owner: root
     group: root
diff --git a/templates/my.cnf.j2 b/templates/mariadb.cnf.j2
similarity index 100%
rename from templates/my.cnf.j2
rename to templates/mariadb.cnf.j2
index cec3980..90dcfaf 100644
--- a/templates/my.cnf.j2
+++ b/templates/mariadb.cnf.j2
@@ -11,8 +11,8 @@
 # warning log-basename is defined later for replication
 # some log option may be ignored.
 # see: https://mariadb.com/kb/en/mysqld-options/#-log-basename
-{{ mariadb_logging_raw }}
 {% endif %}
+{{ mariadb_logging_raw }}
 # Query cache
 {{ mariadb_query_cache_raw }}
 # Character sets