diff --git a/CHANGELOG.md b/CHANGELOG.md index 1515a228..827f30cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,7 @@ The **patch** part changes incrementally at each release. * java8: renamed to java (java8 symlinked to java for backward compatibility) ### Fixed +* mysql-oracle: fix configuration directory variable ### Security diff --git a/mysql-oracle/tasks/config.yml b/mysql-oracle/tasks/config.yml index 82ae50cb..16590a59 100644 --- a/mysql-oracle/tasks/config.yml +++ b/mysql-oracle/tasks/config.yml @@ -1,9 +1,12 @@ --- +- set_fact: + mysql_config_directory: "/etc/mysql/mysql.conf.d" + - name: "Copy MySQL defaults config file" copy: src: evolinux-defaults.cnf - dest: "/etc/mysql/mysql.conf.d/z-evolinux-defaults.cnf" + dest: "{{ mysql_config_directory }}/z-evolinux-defaults.cnf" owner: root group: root mode: "0644" @@ -14,7 +17,7 @@ - name: "Copy MySQL custom config file" template: src: evolinux-custom.cnf.j2 - dest: "/etc/mysql/mysql.conf.d/zzz-evolinux-custom.cnf" + dest: "{{ mysql_config_directory }}/zzz-evolinux-custom.cnf" owner: root group: root mode: "0644" diff --git a/mysql-oracle/tasks/tmpdir.yml b/mysql-oracle/tasks/tmpdir.yml index 2c2c0d91..ca560077 100644 --- a/mysql-oracle/tasks/tmpdir.yml +++ b/mysql-oracle/tasks/tmpdir.yml @@ -13,7 +13,7 @@ - name: Configure tmpdir ini_file: - dest: "/etc/mysql/conf.d/zzz-evolinux-custom.cnf" + dest: "{{ mysql_config_directory }}/zzz-evolinux-custom.cnf" section: mysqld option: tmpdir value: "{{ mysql_custom_tmpdir }}"