Skip to content

Commit adc715d

Browse files
cruelsmithcruelsmith
committed
*Breaking* Remove SSL settings from default_options
* MariaDB <= 11.4 had SSL disabled per default. * MariaDB >= 11.4 enabled zero config ssl ** See https://mariadb.org/mission-impossible-zero-configuration-ssl * MySQL 8.4 brings selfsinged certs and fallsback to no ssl per default.
1 parent 3347ec2 commit adc715d

2 files changed

Lines changed: 9 additions & 35 deletions

File tree

‎manifests/params.pp‎

Lines changed: 8 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,6 @@
9191
$root_group = 'root'
9292
$mysql_group = 'mysql'
9393
$socket = '/var/lib/mysql/mysql.sock'
94-
$ssl_ca = '/etc/mysql/cacert.pem'
95-
$ssl_cert = '/etc/mysql/server-cert.pem'
96-
$ssl_key = '/etc/mysql/server-key.pem'
9794
$tmpdir = '/tmp'
9895
$managed_dirs = undef
9996
# mysql::bindings
@@ -106,6 +103,7 @@
106103
'Suse': {
107104
case $facts['os']['name'] {
108105
'OpenSuSE': {
106+
$provider = 'mariadb'
109107
$socket = '/var/run/mysql/mysql.sock'
110108
$log_error = '/var/log/mysql/mysqld.log'
111109
$pidfile = '/var/run/mysql/mysqld.pid'
@@ -117,6 +115,7 @@
117115
$basedir = undef
118116
}
119117
'SLES','SLED': {
118+
$provider = 'mariadb'
120119
$socket = '/run/mysql/mysql.sock'
121120
$log_error = '/var/log/mysqld.log'
122121
$pidfile = '/var/lib/mysql/mysqld.pid'
@@ -137,9 +136,6 @@
137136
$server_service_name = 'mysql'
138137
$xtrabackup_package_name = 'xtrabackup'
139138

140-
$ssl_ca = '/etc/mysql/cacert.pem'
141-
$ssl_cert = '/etc/mysql/server-cert.pem'
142-
$ssl_key = '/etc/mysql/server-key.pem'
143139
$tmpdir = '/tmp'
144140
$managed_dirs = undef
145141
# mysql::bindings
@@ -181,9 +177,6 @@
181177
$root_group = 'root'
182178
$mysql_group = 'adm'
183179
$socket = '/var/run/mysqld/mysqld.sock'
184-
$ssl_ca = '/etc/mysql/cacert.pem'
185-
$ssl_cert = '/etc/mysql/server-cert.pem'
186-
$ssl_key = '/etc/mysql/server-key.pem'
187180
$tmpdir = '/tmp'
188181
$managed_dirs = ['tmpdir','basedir','datadir','innodb_data_home_dir','innodb_log_group_home_dir','innodb_undo_directory','innodb_tmpdir']
189182

@@ -227,6 +220,7 @@
227220
}
228221

229222
'Archlinux': {
223+
$provider = 'mariadb'
230224
$daemon_dev_package_name = undef
231225
$client_dev_package_name = undef
232226
$includedir = undef
@@ -241,9 +235,6 @@
241235
$mysql_group = 'mysql'
242236
$server_service_name = 'mysqld'
243237
$socket = '/var/lib/mysql/mysql.sock'
244-
$ssl_ca = '/etc/mysql/cacert.pem'
245-
$ssl_cert = '/etc/mysql/server-cert.pem'
246-
$ssl_key = '/etc/mysql/server-key.pem'
247238
$tmpdir = '/tmp'
248239
$managed_dirs = undef
249240
# mysql::bindings
@@ -255,6 +246,7 @@
255246
}
256247

257248
'Gentoo': {
249+
$provider = 'mysql'
258250
$client_package_name = 'virtual/mysql'
259251
$includedir = undef
260252
$server_package_name = 'virtual/mysql'
@@ -267,9 +259,6 @@
267259
$mysql_group = 'mysql'
268260
$server_service_name = 'mysql'
269261
$socket = '/run/mysqld/mysqld.sock'
270-
$ssl_ca = '/etc/mysql/cacert.pem'
271-
$ssl_cert = '/etc/mysql/server-cert.pem'
272-
$ssl_key = '/etc/mysql/server-key.pem'
273262
$tmpdir = '/tmp'
274263
$managed_dirs = undef
275264
# mysql::bindings
@@ -281,6 +270,7 @@
281270
}
282271

283272
'FreeBSD': {
273+
$provider = 'mysql'
284274
$client_package_name = 'databases/mysql57-client'
285275
$server_package_name = 'databases/mysql57-server'
286276
$basedir = '/usr/local'
@@ -293,9 +283,6 @@
293283
$mysql_group = 'mysql'
294284
$server_service_name = 'mysql-server'
295285
$socket = '/var/db/mysql/mysql.sock'
296-
$ssl_ca = undef
297-
$ssl_cert = undef
298-
$ssl_key = undef
299286
$tmpdir = '/tmp'
300287
$managed_dirs = undef
301288
# mysql::bindings
@@ -310,6 +297,7 @@
310297
}
311298

312299
'OpenBSD': {
300+
$provider = 'mariadb'
313301
$client_package_name = 'mariadb-client'
314302
$server_package_name = 'mariadb-server'
315303
$basedir = '/usr/local'
@@ -322,9 +310,6 @@
322310
$mysql_group = '_mysql'
323311
$server_service_name = 'mysqld'
324312
$socket = '/var/run/mysql/mysql.sock'
325-
$ssl_ca = undef
326-
$ssl_cert = undef
327-
$ssl_key = undef
328313
$tmpdir = '/tmp'
329314
$managed_dirs = undef
330315
# mysql::bindings
@@ -341,6 +326,7 @@
341326
default: {
342327
case $facts['os']['name'] {
343328
'Alpine': {
329+
$provider = 'mariadb'
344330
$client_package_name = 'mariadb-client'
345331
$server_package_name = 'mariadb'
346332
$basedir = '/usr'
@@ -352,9 +338,6 @@
352338
$mysql_group = 'mysql'
353339
$server_service_name = 'mariadb'
354340
$socket = '/run/mysqld/mysqld.sock'
355-
$ssl_ca = '/etc/mysql/cacert.pem'
356-
$ssl_cert = '/etc/mysql/server-cert.pem'
357-
$ssl_key = '/etc/mysql/server-key.pem'
358341
$tmpdir = '/tmp'
359342
$managed_dirs = undef
360343
$java_package_name = undef
@@ -366,6 +349,7 @@
366349
$daemon_dev_package_name = undef
367350
}
368351
'Amazon': {
352+
$provider = 'mysql'
369353
$client_package_name = 'mysql'
370354
$server_package_name = 'mysql-server'
371355
$basedir = '/usr'
@@ -378,9 +362,6 @@
378362
$mysql_group = 'mysql'
379363
$server_service_name = 'mysqld'
380364
$socket = '/var/lib/mysql/mysql.sock'
381-
$ssl_ca = '/etc/mysql/cacert.pem'
382-
$ssl_cert = '/etc/mysql/server-cert.pem'
383-
$ssl_key = '/etc/mysql/server-key.pem'
384365
$tmpdir = '/tmp'
385366
$managed_dirs = undef
386367
# mysql::bindings
@@ -451,11 +432,6 @@
451432
'port' => '3306',
452433
'skip-external-locking' => true,
453434
'socket' => $mysql::params::socket,
454-
'ssl' => false,
455-
'ssl-ca' => $mysql::params::ssl_ca,
456-
'ssl-cert' => $mysql::params::ssl_cert,
457-
'ssl-key' => $mysql::params::ssl_key,
458-
'ssl-disable' => false,
459435
'thread_cache_size' => '8',
460436
'thread_stack' => '256K',
461437
'tmpdir' => $mysql::params::tmpdir,

‎templates/my.cnf.epp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
<% if type($v[1]) =~ Type[Hash] { -%>
55
[<%= $v[0] %>]
66
<%sort($v[1].map |$key, $value| { [$key, $value] }).map |$vi| { -%>
7-
<%- if ($vi[0] == 'ssl-disable') or ($vi[0] =~ /^ssl/ and $v[1]['ssl-disable'] == true) or ($vi[0] =~ /^ssl-/ and $v[1]['ssl'] == false) { -%>
8-
<%- next -%>
9-
<%- } elsif $vi[1] == true or $vi[1] == '' { -%>
7+
<%- if $vi[1] == true or $vi[1] == '' { -%>
108
<%= $vi[0] -%>
119
<%- } elsif type($vi[1]) =~ Type[Array] { -%>
1210
<%- $vi[1].each |$vii| { -%>

0 commit comments

Comments
 (0)