From 78c70c1d05e46c09a8d19419a4f5b2b6bd870c30 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Mon, 27 Mar 2023 23:36:26 +0200
Subject: [PATCH] mysql: create log directory for stretch and later

---
 mysql/tasks/main.yml             | 12 +++---------
 mysql/tasks/packages_stretch.yml | 29 +++++++++++++++++++++--------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/mysql/tasks/main.yml b/mysql/tasks/main.yml
index cc32bff4..73493588 100644
--- a/mysql/tasks/main.yml
+++ b/mysql/tasks/main.yml
@@ -4,21 +4,13 @@
   ansible.builtin.set_fact:
     mysql_restart_handler_name: "{{ mysql_restart_if_needed | bool | ternary('restart mysql', 'restart mysql (noop)') }}"
 
-- name: Default log directory is present
-  ansible.builtin.file:
-    path: /var/log/mysql
-    owner: mysql
-    group: adm
-    mode: "2750"
-    state: directory
-  when: ansible_distribution_major_version is version('12', '>=')
-
 - ansible.builtin.include_tasks: packages_stretch.yml
   when: ansible_distribution_major_version is version('9', '>=')
 
 - ansible.builtin.include_tasks: packages_jessie.yml
   when: ansible_distribution_release == "jessie"
 
+
 ## There is nothing to do with users on Debian 11+ - yet we need a /root/.my.cnf for compatibility
 - ansible.builtin.include_tasks: users_bullseye.yml
   when: ansible_distribution_major_version is version('11', '>=')
@@ -32,12 +24,14 @@
 - ansible.builtin.include_tasks: users_jessie.yml
   when: ansible_distribution_release == "jessie"
 
+
 - ansible.builtin.include_tasks: config_stretch.yml
   when: ansible_distribution_major_version is version('9', '>=')
 
 - ansible.builtin.include_tasks: config_jessie.yml
   when: ansible_distribution_release == "jessie"
 
+
 - ansible.builtin.include_tasks: replication.yml
   when: mysql_replication | bool
 
diff --git a/mysql/tasks/packages_stretch.yml b/mysql/tasks/packages_stretch.yml
index 8853a13c..acd98d2e 100644
--- a/mysql/tasks/packages_stretch.yml
+++ b/mysql/tasks/packages_stretch.yml
@@ -8,8 +8,21 @@
     update_cache: yes
     state: present
   tags:
-  - mysql
-  - packages
+    - mysql
+    - packages
+
+- name: Default log directory is present
+  ansible.builtin.file:
+    path: /var/log/mysql
+    owner: mysql
+    group: adm
+    mode: "2750"
+    state: directory
+  notify: restart mysql
+  tags:
+    - mysql
+    - packages
+  when: ansible_distribution_major_version is version('12', '>=')
 
 - name: Install MySQL dev packages
   ansible.builtin.apt:
@@ -17,8 +30,8 @@
     update_cache: yes
     state: present
   tags:
-  - mysql
-  - packages
+    - mysql
+    - packages
   when: mysql_install_libclient | bool
 
 - name: MySQL is started
@@ -26,16 +39,16 @@
     name: mysql
     state: started
   tags:
-  - mysql
-  - services
+    - mysql
+    - services
 
 - name: apg package is installed
   ansible.builtin.apt:
     name: apg
     state: present
   tags:
-  - mysql
-  - packages
+    - mysql
+    - packages
 
 - name: Python2 dependencies for Ansible are installed
   ansible.builtin.apt: