Skip to content

Commit 85bb33f

Browse files
nervonervo
committed
feat: Global *SQL login options
1 parent b5da03f commit 85bb33f

File tree

19 files changed

+79
-98
lines changed

19 files changed

+79
-98
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99
### Added
1010
- [Apt] Add `trusted` parameter for repositories
1111
- [Apt] Add `default_src`, `backports_src`, and `backports_sloppy_src` repositories
12+
- [PostgreSQL] Add more global default login options (`manala_postgresql_login_port`, `manala_postgresql_login_unix_socket`, `manala_postgresql_login_user` and `manala_postgresql_login_password`)
13+
- [MySQL] Add global default login options (`manala_mysql_login_host`, `manala_mysql_login_port`, `manala_mysql_login_unix_socket`, `manala_mysql_login_user` and `manala_mysql_login_password`)
14+
- [MySQL] Support replications login options
1215

1316
### Fixed
1417
- [Apt] Handle repository types properly

‎extensions/molecule/mysql.8.0/converge.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,14 @@
2121
config:
2222
mysqld:
2323
default-authentication-plugin: mysql_native_password
24+
manala_mysql_login_unix_socket: /var/run/mysqld/mysqld.sock
2425
manala_mysql_users:
2526
- name: foo
2627
password: foo
2728
host: localhost
2829
priv: "*.*:ALL,GRANT"
29-
login_unix_socket: /var/run/mysqld/mysqld.sock
3030
manala_mysql_databases:
3131
- name: foo
32-
login_unix_socket: /var/run/mysqld/mysqld.sock
3332
always:
3433
- name: Goss
3534
ansible.builtin.command:

‎extensions/molecule/mysql.8.4/converge.yml‎

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,14 @@
2222
config:
2323
mysqld:
2424
mysql_native_password: 'ON'
25+
manala_mysql_login_unix_socket: /var/run/mysqld/mysqld.sock
2526
manala_mysql_users:
2627
- name: foo
2728
password: foo
2829
host: localhost
2930
priv: "*.*:ALL,GRANT"
30-
login_unix_socket: /var/run/mysqld/mysqld.sock
3131
manala_mysql_databases:
3232
- name: foo
33-
login_unix_socket: /var/run/mysqld/mysqld.sock
3433
always:
3534
- name: Goss
3635
ansible.builtin.command:
@@ -288,16 +287,15 @@
288287
config:
289288
mysqld:
290289
mysql_native_password: 'ON'
290+
manala_mysql_login_unix_socket: /var/run/mysqld/mysqld.sock
291291
manala_mysql_users:
292292
# Privileges and password
293293
- name: foo
294294
password: foo
295295
host: localhost
296296
priv: "*.*:ALL,GRANT"
297-
login_unix_socket: /var/run/mysqld/mysqld.sock
298297
- name: bar
299298
state: absent
300-
login_unix_socket: /var/run/mysqld/mysqld.sock
301299
- name: Create users to absent/ignore later
302300
community.mysql.mysql_user:
303301
name: "{{ item }}"
@@ -317,38 +315,31 @@
317315
config:
318316
mysqld:
319317
mysql_native_password: 'ON'
318+
manala_mysql_login_unix_socket: /var/run/mysqld/mysqld.sock
320319
manala_mysql_users:
321320
# Privileges and password
322321
- name: foo
323322
password: foo
324323
host: localhost
325324
priv: "*.*:ALL,GRANT"
326-
login_unix_socket: /var/run/mysqld/mysqld.sock
327325
# States
328326
- name: state_present_implicit
329-
login_unix_socket: /var/run/mysqld/mysqld.sock
330327
- name: state_present
331328
state: present
332-
login_unix_socket: /var/run/mysqld/mysqld.sock
333329
- name: state_absent
334330
state: absent
335-
login_unix_socket: /var/run/mysqld/mysqld.sock
336331
- name: state_absent_existing
337332
state: absent
338-
login_unix_socket: /var/run/mysqld/mysqld.sock
339333
- name: state_ignored
340334
state: ignore
341-
login_unix_socket: /var/run/mysqld/mysqld.sock
342335
- name: state_ignore_existing
343336
state: ignore
344-
login_unix_socket: /var/run/mysqld/mysqld.sock
345337
# Flatten
346338
-
347339
- name: baz
348340
password: baz
349341
host: localhost
350342
priv: "*.*:ALL,GRANT"
351-
login_unix_socket: /var/run/mysqld/mysqld.sock
352343
always:
353344
- name: Goss
354345
ansible.builtin.command:
@@ -378,10 +369,10 @@
378369
config:
379370
mysqld:
380371
mysql_native_password: 'ON'
372+
manala_mysql_login_unix_socket: /var/run/mysqld/mysqld.sock
381373
manala_mysql_databases:
382374
- name: bar
383375
state: absent
384-
login_unix_socket: /var/run/mysqld/mysqld.sock
385376
- name: Create databases to absent/ignore later
386377
community.mysql.mysql_db:
387378
name: "{{ item }}"
@@ -401,29 +392,23 @@
401392
config:
402393
mysqld:
403394
mysql_native_password: 'ON'
395+
manala_mysql_login_unix_socket: /var/run/mysqld/mysqld.sock
404396
manala_mysql_databases:
405397
# States
406398
- name: state_present_implicit
407-
login_unix_socket: /var/run/mysqld/mysqld.sock
408399
- name: state_present
409400
state: present
410-
login_unix_socket: /var/run/mysqld/mysqld.sock
411401
- name: state_absent
412402
state: absent
413-
login_unix_socket: /var/run/mysqld/mysqld.sock
414403
- name: state_absent_existing
415404
state: absent
416-
login_unix_socket: /var/run/mysqld/mysqld.sock
417405
- name: state_ignored
418406
state: ignore
419-
login_unix_socket: /var/run/mysqld/mysqld.sock
420407
- name: state_ignore_existing
421408
state: ignore
422-
login_unix_socket: /var/run/mysqld/mysqld.sock
423409
# Flatten
424410
-
425411
- name: baz
426-
login_unix_socket: /var/run/mysqld/mysqld.sock
427412
always:
428413
- name: Goss
429414
ansible.builtin.command:

‎extensions/molecule/mysql.galera.4.10.mysql_wsrep.8.0.26/converge.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
- galera-arbitrator-4
2020
- mysql-wsrep-server
2121
- mysql-wsrep-client
22+
manala_mysql_login_unix_socket: /var/run/mysqld/mysqld.sock
2223
manala_mysql_users:
2324
- name: foo
2425
password: foo
2526
host: localhost
2627
priv: "*.*:ALL,GRANT"
27-
login_unix_socket: /var/run/mysqld/mysqld.sock
2828
- name: bar
2929
state: ignore
3030
# Flatten
@@ -33,17 +33,13 @@
3333
password: baz
3434
host: localhost
3535
priv: "*.*:ALL,GRANT"
36-
login_unix_socket: /var/run/mysqld/mysqld.sock
3736
manala_mysql_databases:
3837
- name: foo
39-
login_unix_socket: /var/run/mysqld/mysqld.sock
4038
- name: bar
4139
state: ignore
42-
login_unix_socket: /var/run/mysqld/mysqld.sock
4340
# Flatten
4441
-
4542
- name: baz
46-
login_unix_socket: /var/run/mysqld/mysqld.sock
4743
always:
4844
- name: Goss
4945
ansible.builtin.command:

‎extensions/molecule/mysql.galera.4.23.mysql_wsrep.8.4.5/converge.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,32 +26,27 @@
2626
- galera-arbitrator-4
2727
- mysql-wsrep-server
2828
- mysql-wsrep-client
29+
manala_mysql_login_unix_socket: /var/run/mysqld/mysqld.sock
2930
manala_mysql_users:
3031
- name: foo
3132
password: foo
3233
host: localhost
3334
priv: "*.*:ALL,GRANT"
34-
login_unix_socket: /var/run/mysqld/mysqld.sock
3535
- name: bar
3636
state: ignore
37-
login_unix_socket: /var/run/mysqld/mysqld.sock
3837
# Flatten
3938
-
4039
- name: baz
4140
password: baz
4241
host: localhost
4342
priv: "*.*:ALL,GRANT"
44-
login_unix_socket: /var/run/mysqld/mysqld.sock
4543
manala_mysql_databases:
4644
- name: foo
47-
login_unix_socket: /var/run/mysqld/mysqld.sock
4845
- name: bar
4946
state: ignore
50-
login_unix_socket: /var/run/mysqld/mysqld.sock
5147
# Flatten
5248
-
5349
- name: baz
54-
login_unix_socket: /var/run/mysqld/mysqld.sock
5550
always:
5651
- name: Goss
5752
ansible.builtin.command:

‎extensions/molecule/mysql.mariadb.10.11/converge.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,32 +18,27 @@
1818
manala_mysql_install_packages:
1919
- mariadb-server
2020
- mariadb-client
21+
manala_mysql_login_unix_socket: /var/run/mysqld/mysqld.sock
2122
manala_mysql_users:
2223
- name: foo
2324
password: foo
2425
host: localhost
2526
priv: "*.*:ALL,GRANT"
26-
login_unix_socket: /var/run/mysqld/mysqld.sock
2727
- name: bar
2828
state: ignore
29-
login_unix_socket: /var/run/mysqld/mysqld.sock
3029
# Flatten
3130
-
3231
- name: baz
3332
password: baz
3433
host: localhost
3534
priv: "*.*:ALL,GRANT"
36-
login_unix_socket: /var/run/mysqld/mysqld.sock
3735
manala_mysql_databases:
3836
- name: foo
39-
login_unix_socket: /var/run/mysqld/mysqld.sock
4037
- name: bar
4138
state: ignore
42-
login_unix_socket: /var/run/mysqld/mysqld.sock
4339
# Flatten
4440
-
4541
- name: baz
46-
login_unix_socket: /var/run/mysqld/mysqld.sock
4742
- name: Goss
4843
ansible.builtin.command:
4944
cmd: goss --gossfile - validate

‎extensions/molecule/mysql.mariadb.10.5/converge.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
manala_mysql_install_packages:
1818
- mariadb-server
1919
- mariadb-client
20+
manala_mysql_login_unix_socket: /var/run/mysqld/mysqld.sock
2021
manala_mysql_users:
2122
- name: foo
2223
password: foo
2324
host: localhost
2425
priv: "*.*:ALL,GRANT"
25-
login_unix_socket: /var/run/mysqld/mysqld.sock
2626
- name: bar
2727
state: ignore
2828
# Flatten
@@ -31,16 +31,13 @@
3131
password: baz
3232
host: localhost
3333
priv: "*.*:ALL,GRANT"
34-
login_unix_socket: /var/run/mysqld/mysqld.sock
3534
manala_mysql_databases:
3635
- name: foo
37-
login_unix_socket: /var/run/mysqld/mysqld.sock
3836
- name: bar
3937
state: ignore
4038
# Flatten
4139
-
4240
- name: baz
43-
login_unix_socket: /var/run/mysqld/mysqld.sock
4441
always:
4542
- name: Goss
4643
ansible.builtin.command:

‎extensions/molecule/mysql.mariadb.10.6/converge.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
manala_mysql_install_packages:
1818
- mariadb-server
1919
- mariadb-client
20+
manala_mysql_login_unix_socket: /var/run/mysqld/mysqld.sock
2021
manala_mysql_users:
2122
- name: foo
2223
password: foo
2324
host: localhost
2425
priv: "*.*:ALL,GRANT"
25-
login_unix_socket: /var/run/mysqld/mysqld.sock
2626
- name: bar
2727
state: ignore
2828
# Flatten
@@ -31,16 +31,13 @@
3131
password: baz
3232
host: localhost
3333
priv: "*.*:ALL,GRANT"
34-
login_unix_socket: /var/run/mysqld/mysqld.sock
3534
manala_mysql_databases:
3635
- name: foo
37-
login_unix_socket: /var/run/mysqld/mysqld.sock
3836
- name: bar
3937
state: ignore
4038
# Flatten
4139
-
4240
- name: baz
43-
login_unix_socket: /var/run/mysqld/mysqld.sock
4441
always:
4542
- name: Goss
4643
ansible.builtin.command:

‎extensions/molecule/mysql.mariadb.11.4/converge.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,32 +18,27 @@
1818
manala_mysql_install_packages:
1919
- mariadb-server
2020
- mariadb-client
21+
manala_mysql_login_unix_socket: /var/run/mysqld/mysqld.sock
2122
manala_mysql_users:
2223
- name: foo
2324
password: foo
2425
host: localhost
2526
priv: "*.*:ALL,GRANT"
26-
login_unix_socket: /var/run/mysqld/mysqld.sock
2727
- name: bar
2828
state: ignore
29-
login_unix_socket: /var/run/mysqld/mysqld.sock
3029
# Flatten
3130
-
3231
- name: baz
3332
password: baz
3433
host: localhost
3534
priv: "*.*:ALL,GRANT"
36-
login_unix_socket: /var/run/mysqld/mysqld.sock
3735
manala_mysql_databases:
3836
- name: foo
39-
login_unix_socket: /var/run/mysqld/mysqld.sock
4037
- name: bar
4138
state: ignore
42-
login_unix_socket: /var/run/mysqld/mysqld.sock
4339
# Flatten
4440
-
4541
- name: baz
46-
login_unix_socket: /var/run/mysqld/mysqld.sock
4742
always:
4843
- name: Goss
4944
ansible.builtin.command:

0 commit comments

Comments
 (0)