simplify vars-handling

Signed-off-by: Sebastian Gumprich <github@gumpri.ch>

defaults/main.yml

@@ -5,10 +5,6 @@ mysql_hardening_enabled: true
 mysql_daemon_enabled: true
 
 # general configuration
-mysql_cnf_owner: 'root' # owner of /etc/mysql/*.cnf files
-mysql_cnf_group: 'root' # owner of /etc/mysql/*.cnf files
-mysql_hardening_user: 'mysql' # owner of data
-mysql_hardening_group: 'mysql'
 mysql_datadir: '/var/lib/mysql'
 mysql_hardening_mysql_hardening_conf_file: '{{mysql_hardening_mysql_confd_dir}}/hardening.cnf'
 # You have to change this to your own strong enough mysql root password

tasks/configure.yml

@@ -3,7 +3,7 @@
 - name: protect my.cnf
   file:
     path: '{{ mysql_hardening_mysql_conf_file }}'
-    mode: 0400
+    mode: '0400'
     owner: '{{ mysql_cnf_owner }}'
     group: '{{ mysql_cnf_owner }}'
     follow: true
@@ -18,7 +18,7 @@
 
 - name: ensure permissions on mysql-logfile are correct
   file:
-    path: '{{ mysql_hardening_log_dir }}/{{ mysql_hardening_log_file }}'
+    path: '{{ mysql_hardening_log_file }}'
     state: file
     owner: '{{ mysql_hardening_user }}'
     group: '{{ mysql_hardening_group }}'

tasks/main.yml

@@ -1,12 +1,11 @@
 ---
-
-- name: add the OS specific variables
-  include_vars: "{{ item }}"
+- name: set OS dependent variables
+  include_vars: '{{ item }}'
   with_first_found:
-    - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
-    - "{{ ansible_distribution }}.yml"
-    - "{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml"
-    - "{{ ansible_os_family }}.yml"
+    - '{{ ansible_facts.distribution }}_{{ ansible_facts.distribution_major_version }}.yml'
+    - '{{ ansible_facts.distribution }}.yml'
+    - '{{ ansible_facts.os_family }}_{{ ansible_facts.distribution_major_version }}.yml'
+    - '{{ ansible_facts.os_family }}.yml'
   tags: always
 
 - include: configure.yml

vars/Debian.yml

@@ -4,11 +4,11 @@ mysql_daemon: mysql
 mysql_hardening_mysql_conf_file: '/etc/mysql/my.cnf'
 mysql_hardening_mysql_confd_dir: '/etc/mysql/conf.d'
 
-mysql_hardening_log_dir: '/var/log'
-mysql_hardening_log_file: 'mysql.log'
+mysql_hardening_log_dir: '/var/log/mysql/error.log'
 
-mysql_hardening_user: 'mysql' # owner of data
 mysql_hardening_group: 'adm'
 
+mysql_cnf_owner: 'mysql'  # owner of /etc/mysql/*.cnf files
+mysql_cnf_group: 'mysql'  # owner of /etc/mysql/*.cnf files
 
-mysql_python_package: "python-mysqldb"
+mysql_python_package: "python3-pymysql"

vars/Oracle Linux.yml

@@ -4,8 +4,6 @@ mysql_daemon: mysqld
 mysql_hardening_mysql_conf_file: '/etc/my.cnf'
 mysql_hardening_mysql_confd_dir: '/etc/my.cnf.d'
 
-mysql_hardening_log_dir: '/var/log'
-mysql_hardening_log_file: 'mysqld.log'
+mysql_hardening_log_dir: '/var/log/mysqld.log'
 
-mysql_hardening_user: 'mysql' # owner of data
 mysql_hardening_group: 'adm'

vars/RedHat-7.yml

@@ -1,7 +0,0 @@
-mysql_daemon: mariadb
-mysql_hardening_mysql_conf_file: '/etc/my.cnf'
-mysql_hardening_mysql_confd_dir: '/etc/my.cnf.d'
-mysql_hardening_log_dir: '/var/log/mariadb'
-mysql_hardening_log_file: 'mariadb.log'
-
-mysql_python_package: "MySQL-python"

vars/RedHat-8.yml

@@ -1,8 +0,0 @@
----
-mysql_daemon: mariadb
-mysql_hardening_mysql_conf_file: '/etc/my.cnf'
-mysql_hardening_mysql_confd_dir: '/etc/my.cnf.d'
-mysql_hardening_log_dir: '/var/log/mariadb'
-mysql_hardening_log_file: 'mariadb.log'
-
-mysql_python_package: "python3-mysqlclient"

vars/RedHat.yml

@@ -1,13 +0,0 @@
----
-mysql_daemon: mysqld
-
-mysql_hardening_mysql_conf_file: '/etc/my.cnf'
-mysql_hardening_mysql_confd_dir: '/etc/my.cnf.d'
-
-mysql_hardening_log_dir: '/var/log/'
-mysql_hardening_log_file: 'mysqld.log'
-
-mysql_hardening_user: 'mysql' # owner of data
-mysql_hardening_group: 'mysql'
-
-mysql_python_package: "MySQL-python"

vars/RedHat_7.yml

@@ -0,0 +1,13 @@
+---
+mysql_daemon: mariadb
+mysql_hardening_mysql_conf_file: '/etc/my.cnf'
+mysql_hardening_mysql_confd_dir: '/etc/my.cnf.d'
+
+mysql_hardening_log_file: '/var/log/mariadb/mariadb.log'
+
+mysql_python_package: 'MySQL-python'
+
+mysql_cnf_owner: 'mysql'  # owner of /etc/mysql/*.cnf files
+mysql_cnf_group: 'mysql'  # owner of /etc/mysql/*.cnf files
+
+mysql_hardening_group: 'mysql'

vars/RedHat_8.yml

@@ -0,0 +1,12 @@
+---
+mysql_daemon: mariadb
+mysql_hardening_mysql_conf_file: '/etc/my.cnf'
+mysql_hardening_mysql_confd_dir: '/etc/my.cnf.d'
+mysql_hardening_log_dir: '/var/log/mariadb/mariadb.log'
+
+mysql_python_package: 'python3-mysqlclient'
+
+mysql_cnf_owner: 'mysql'  # owner of /etc/mysql/*.cnf files
+mysql_cnf_group: 'mysql'  # owner of /etc/mysql/*.cnf files
+
+mysql_hardening_group: 'mysql'

vars/Ubuntu-20.04.yml

@@ -1,2 +0,0 @@
----
-mysql_python_package: "python3-mysqldb"

vars/Ubuntu_16.yml

@@ -0,0 +1,11 @@
+---
+mysql_daemon: mysql
+
+mysql_hardening_mysql_conf_file: '/etc/mysql/my.cnf'
+mysql_hardening_mysql_confd_dir: '/etc/mysql/conf.d'
+
+mysql_hardening_log_dir: '/var/log/mysql/error.log'
+
+mysql_hardening_group: 'adm'
+
+mysql_python_package: "python-mysqldb"

vars/Ubuntu_18.yml

@@ -0,0 +1,11 @@
+---
+mysql_daemon: mysql
+
+mysql_hardening_mysql_conf_file: '/etc/mysql/my.cnf'
+mysql_hardening_mysql_confd_dir: '/etc/mysql/conf.d'
+
+mysql_hardening_log_dir: '/var/log/mysql/error.log'
+
+mysql_hardening_group: 'adm'
+
+mysql_python_package: "python-mysqldb"

vars/Ubuntu_20.yml

@@ -0,0 +1,11 @@
+---
+mysql_daemon: mysql
+
+mysql_hardening_mysql_conf_file: '/etc/mysql/my.cnf'
+mysql_hardening_mysql_confd_dir: '/etc/mysql/conf.d'
+
+mysql_hardening_log_dir: '/var/log/mysql/error.log'
+
+mysql_hardening_group: 'adm'
+
+mysql_python_package: "python3-mysqldb"

vars/main.yml

@@ -1,3 +1,3 @@
 ---
-mysql_hardening_log_dir: '/var/log'
-mysql_hardening_log_file: 'mysql.log'
+
+mysql_hardening_user: 'mysql'  # owner of data