Skip to content

Commit 233fbe6

Browse files
author
Stefan Schwarz
committed
tcp and socket connect
1 parent 417fb70 commit 233fbe6

File tree

2 files changed

+47
-8
lines changed

2 files changed

+47
-8
lines changed

defaults/main.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,16 @@ mysql_mysqldump_fullpath_alldbs: "{{ mysql_mysqldump_directory }}/{{ mysql_mysql
1414
mysql_mysqldump_fullpath_ringbuffer: "{{ mysql_mysqldump_directory_ringbuffer }}/{{ mysql_mysqldump_shellscript_ringbuffer }}"
1515
mysql_mysqldump_cronjob_alldbs_create: False
1616
mysql_mysqldump_cronjob_ringbuffer_create: True
17-
mysql_mysqldump_cronjob_alldbs_dest: "/etc/cron.daily/mysql_mysqldump_alldbs"
17+
mysql_mysqldump_cronjob_alldbs_dest: "/etc/cron.d/mysql_mysqldump_alldbs"
1818
mysql_mysqldump_cronjob_alldbs_template: "mysqldump_cronjob_alldbs.j2"
1919
mysql_mysqldump_cronjob_ringbuffer_dest: "/etc/cron.daily/mysql_mysqldump_ringbuffer"
2020
mysql_mysqldump_cronjob_ringbuffer_template: "mysqldump_cronjob_ringbuffer.j2"
2121
mysql_mysqldump_backup_cred_file: "{{ mysql_mysqldump_directory }}/backup_my.cnf"
2222
mysql_mysqldump_backup_cred_file_overwrite: False
2323
mysql_mysqldump_ringbuffer_retention_days: 10
2424
mysql_mysqldump_fail_if_mycnf_file_missing: False
25+
mysql_mysqldump_connect_method: socket
26+
# if mysql_mysqldump_connect_method: tcp
27+
# mysql_mysqldump_connect_ip: "127.0.0.1"
28+
# mysql_mysqldump_connect_ip: localhost
29+
mysql_mysqldump_connect_port: 3306

tasks/main.yml

Lines changed: 41 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,18 +71,41 @@
7171
- ringbuffer
7272
- user
7373

74-
- name: Create MySQL backup user
74+
- name: Create MySQL backup user (socket)
7575
# needs python-mysqldb or python3-mysqldb
7676
mysql_user:
77-
config_file: "{{ mysql_mycnf_file }}"
7877
name: "{{ mysql_mysqldump_user_name }}"
79-
host: "localhost"
8078
password: "{{ mysql_mysqldump_user_password }}"
79+
check_implicit_admin: true
8180
priv: "*.*:SELECT,FILE,LOCK TABLES"
8281
state: "present"
8382
append_privs: "yes"
8483
encrypted: "no"
85-
when: not mysql_mysqldump_backup_cred_file_exists.stat.exists or mysql_mysqldump_backup_cred_file_overwrite
84+
when:
85+
- not mysql_mysqldump_backup_cred_file_exists.stat.exists or mysql_mysqldump_backup_cred_file_overwrite
86+
- mysql_mysqldump_connect_method == "socket"
87+
no_log: true
88+
tags:
89+
- alldbs
90+
- check
91+
- ringbuffer
92+
- user
93+
94+
- name: Create MySQL backup user (tcp mode)
95+
# needs python-mysqldb or python3-mysqldb
96+
mysql_user:
97+
name: "{{ mysql_mysqldump_user_name }}"
98+
password: "{{ mysql_mysqldump_user_password }}"
99+
host: "{{ mysql_mysqldump_user_host }}"
100+
login_host: "{{ mysql_mysqldump_connect_ip }}"
101+
check_implicit_admin: true
102+
priv: "*.*:SELECT,FILE,LOCK TABLES"
103+
state: "present"
104+
append_privs: "yes"
105+
encrypted: "no"
106+
when:
107+
- not mysql_mysqldump_backup_cred_file_exists.stat.exists or mysql_mysqldump_backup_cred_file_overwrite
108+
- mysql_mysqldump_connect_method == "tcp"
86109
no_log: true
87110
tags:
88111
- alldbs
@@ -187,11 +210,22 @@
187210
- cronjob
188211
- ringbuffer
189212

190-
- name: Check if credentials are working for mysqldump
191-
command: mysqladmin --defaults-file="{{ mysql_mysqldump_backup_cred_file }}" -hlocalhost -P3306 ping
213+
- name: Check if credentials are working for mysqldump (socket)
214+
command: mysqladmin --defaults-file="{{ mysql_mysqldump_backup_cred_file }}" ping
192215
register: mysqladmin_output
193216
changed_when: False
194-
check_mode: yes
217+
when:
218+
- mysql_mysqldump_connect_method == "socket"
219+
tags:
220+
- check
221+
- user
222+
223+
- name: Check if credentials are working for mysqldump (tcp)
224+
command: mysqladmin --defaults-file="{{ mysql_mysqldump_backup_cred_file }}" -h"{{ mysql_mysqldump_connect_ip }}" -P"{{ mysql_mysqldump_connect_port }}" ping
225+
register: mysqladmin_output
226+
changed_when: False
227+
when:
228+
- mysql_mysqldump_connect_method == "tcp"
195229
tags:
196230
- check
197231
- user

0 commit comments

Comments
 (0)