Merge pull request dev-sec#55 from dev-sec/fix_vars

fix missing variables
divialth · Oct 13, 2020 · 7c235c9 · 7c235c9
2 parents 9fd7193 + 7c89b8a
commit 7c235c9
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 6 deletions.
diff --git a/vars/Debian.yml b/vars/Debian.yml
@@ -4,7 +4,7 @@ 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_log_file: '/var/log/mysql/error.log'
 
 mysql_hardening_group: 'adm'
 

diff --git a/vars/Oracle Linux.yml b/vars/Oracle Linux.yml
@@ -4,6 +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/mysqld.log'
+mysql_hardening_log_file: '/var/log/mysqld.log'
 
 mysql_hardening_group: 'adm'
diff --git a/vars/RedHat_8.yml b/vars/RedHat_8.yml
@@ -2,7 +2,7 @@
 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_hardening_log_file: '/var/log/mariadb/mariadb.log'
 
 mysql_python_package: 'python3-mysqlclient'
 

diff --git a/vars/Ubuntu_16.yml b/vars/Ubuntu_16.yml
@@ -4,8 +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/error.log'
+mysql_hardening_log_file: '/var/log/mysql/error.log'
 
 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"
diff --git a/vars/Ubuntu_18.yml b/vars/Ubuntu_18.yml
@@ -4,8 +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/error.log'
+mysql_hardening_log_file: '/var/log/mysql/error.log'
 
 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"
diff --git a/vars/Ubuntu_20.yml b/vars/Ubuntu_20.yml
@@ -4,8 +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/error.log'
+mysql_hardening_log_file: '/var/log/mysql/error.log'
 
 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: "python3-mysqldb"