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.
This commit is contained in:
Jérémy Lecour 2017-11-29 10:02:02 +01:00 committed by Jérémy Lecour
parent 635aa5f8a1
commit 3d5c004d8a
5 changed files with 20 additions and 6 deletions

View File

@ -22,3 +22,6 @@ mysql_cron_mysqltuner: True
mysql_cron_mysqltuner_frequency: monthly mysql_cron_mysqltuner_frequency: monthly
mysql_force_new_nrpe_password: False mysql_force_new_nrpe_password: False
mysql_evolinux_defaults_file: z-evolinux-defaults.cnf
mysql_evolinux_custom_file: zzz-evolinux-custom.cnf

View File

@ -1,8 +1,12 @@
--- ---
- set_fact:
mysql_config_directory: /etc/mysql/conf.d
- name: "Copy MySQL defaults config file (jessie)" - name: "Copy MySQL defaults config file (jessie)"
copy: copy:
src: evolinux-defaults.cnf src: evolinux-defaults.cnf
dest: /etc/mysql/conf.d/z-evolinux-defaults.cnf dest: "{{ mysql_config_directory }}/{{ mysql_evolinux_defaults_file }}"
owner: root owner: root
group: root group: root
mode: "0644" mode: "0644"
@ -13,7 +17,7 @@
- name: "Copy MySQL custom config file (jessie)" - name: "Copy MySQL custom config file (jessie)"
template: template:
src: evolinux-custom.cnf.j2 src: evolinux-custom.cnf.j2
dest: /etc/mysql/conf.d/zzz-evolinux-custom.cnf dest: "{{ mysql_config_directory }}/{{ mysql_evolinux_custom_file }}"
owner: root owner: root
group: root group: root
mode: "0644" mode: "0644"

View File

@ -1,8 +1,12 @@
--- ---
- set_fact:
mysql_config_directory: /etc/mysql/mariadb.conf.d
- name: "Copy MySQL defaults config file (Debian 9 or later)" - name: "Copy MySQL defaults config file (Debian 9 or later)"
copy: copy:
src: evolinux-defaults.cnf src: evolinux-defaults.cnf
dest: /etc/mysql/mariadb.conf.d/z-evolinux-defaults.cnf dest: "{{ mysql_config_directory }}/{{ mysql_evolinux_defaults_file }}"
owner: root owner: root
group: root group: root
mode: "0644" mode: "0644"
@ -13,7 +17,7 @@
- name: "Copy MySQL custom config file (Debian 9 or later)" - name: "Copy MySQL custom config file (Debian 9 or later)"
template: template:
src: evolinux-custom.cnf.j2 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 owner: root
group: root group: root
mode: "0644" mode: "0644"

View File

@ -39,4 +39,7 @@
state: started state: started
tags: tags:
- mysql - 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

View File

@ -13,7 +13,7 @@
- name: Configure tmpdir - name: Configure tmpdir
ini_file: ini_file:
dest: /etc/mysql/conf.d/zzz_evolinux.cnf dest: "{{ mysql_config_directory }}/{{ mysql_evolinux_custom_file }}"
section: mysqld section: mysqld
option: tmpdir option: tmpdir
value: "{{ mysql_custom_tmpdir }}" value: "{{ mysql_custom_tmpdir }}"