From 3d5c004d8a522b654df2d28b8517a9998904f864 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Wed, 29 Nov 2017 10:02:02 +0100
Subject: [PATCH] mysql: parameterize evolinux config files

The tmpdir task was not using the right file.
We use a variable for those files, to hemp with maintenance ans
customization.
---
 mysql/defaults/main.yml        | 3 +++
 mysql/tasks/config_jessie.yml  | 8 ++++++--
 mysql/tasks/config_stretch.yml | 8 ++++++--
 mysql/tasks/datadir.yml        | 5 ++++-
 mysql/tasks/tmpdir.yml         | 2 +-
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/mysql/defaults/main.yml b/mysql/defaults/main.yml
index d56e5999..ff40c88a 100644
--- a/mysql/defaults/main.yml
+++ b/mysql/defaults/main.yml
@@ -22,3 +22,6 @@ mysql_cron_mysqltuner: True
 mysql_cron_mysqltuner_frequency: monthly
 
 mysql_force_new_nrpe_password: False
+
+mysql_evolinux_defaults_file: z-evolinux-defaults.cnf
+mysql_evolinux_custom_file: zzz-evolinux-custom.cnf
diff --git a/mysql/tasks/config_jessie.yml b/mysql/tasks/config_jessie.yml
index dcb83a61..9fe11bb7 100644
--- a/mysql/tasks/config_jessie.yml
+++ b/mysql/tasks/config_jessie.yml
@@ -1,8 +1,12 @@
 ---
+
+- set_fact:
+    mysql_config_directory: /etc/mysql/conf.d
+
 - name: "Copy MySQL defaults config file (jessie)"
   copy:
     src: evolinux-defaults.cnf
-    dest: /etc/mysql/conf.d/z-evolinux-defaults.cnf
+    dest: "{{ mysql_config_directory }}/{{ mysql_evolinux_defaults_file }}"
     owner: root
     group: root
     mode: "0644"
@@ -13,7 +17,7 @@
 - name: "Copy MySQL custom config file (jessie)"
   template:
     src: evolinux-custom.cnf.j2
-    dest: /etc/mysql/conf.d/zzz-evolinux-custom.cnf
+    dest: "{{ mysql_config_directory }}/{{ mysql_evolinux_custom_file }}"
     owner: root
     group: root
     mode: "0644"
diff --git a/mysql/tasks/config_stretch.yml b/mysql/tasks/config_stretch.yml
index 22b2d312..eb31086e 100644
--- a/mysql/tasks/config_stretch.yml
+++ b/mysql/tasks/config_stretch.yml
@@ -1,8 +1,12 @@
 ---
+
+- set_fact:
+    mysql_config_directory: /etc/mysql/mariadb.conf.d
+
 - name: "Copy MySQL defaults config file (Debian 9 or later)"
   copy:
     src: evolinux-defaults.cnf
-    dest: /etc/mysql/mariadb.conf.d/z-evolinux-defaults.cnf
+    dest: "{{ mysql_config_directory }}/{{ mysql_evolinux_defaults_file }}"
     owner: root
     group: root
     mode: "0644"
@@ -13,7 +17,7 @@
 - name: "Copy MySQL custom config file (Debian 9 or later)"
   template:
     src: evolinux-custom.cnf.j2
-    dest: /etc/mysql/mariadb.conf.d/zzz-evolinux-custom.cnf
+    dest: "{{ mysql_config_directory }}/{{ mysql_evolinux_custom_file }}"
     owner: root
     group: root
     mode: "0644"
diff --git a/mysql/tasks/datadir.yml b/mysql/tasks/datadir.yml
index b8d39aac..28beb1ed 100644
--- a/mysql/tasks/datadir.yml
+++ b/mysql/tasks/datadir.yml
@@ -39,4 +39,7 @@
       state: started
   tags:
     - mysql
-  when: mysql_custom_datadir != '' and mysql_custom_datadir != mysql_current_real_datadir_test.stdout and not mysql_custom_datadir_test.stat.exists
+  when:
+    - mysql_custom_datadir != ''
+    - mysql_custom_datadir != mysql_current_real_datadir_test.stdout
+    - not mysql_custom_datadir_test.stat.exists
diff --git a/mysql/tasks/tmpdir.yml b/mysql/tasks/tmpdir.yml
index 7cbd7de8..35942612 100644
--- a/mysql/tasks/tmpdir.yml
+++ b/mysql/tasks/tmpdir.yml
@@ -13,7 +13,7 @@
 
   - name: Configure tmpdir
     ini_file:
-      dest: /etc/mysql/conf.d/zzz_evolinux.cnf
+      dest: "{{ mysql_config_directory }}/{{ mysql_evolinux_custom_file }}"
       section: mysqld
       option: tmpdir
       value: "{{ mysql_custom_tmpdir }}"