Mercurial > repos > other > Puppet
diff modules/mysql/manifests/server/account_security.pp @ 443:c6c9a2cfcfbd
Update MySQL module
Fixes a problem with MariaDB and blank certificate paths
| author | IBBoard <dev@ibboard.co.uk> |
|---|---|
| date | Mon, 08 May 2023 11:48:41 +0100 |
| parents | 668df4711671 |
| children |
line wrap: on
line diff
--- a/modules/mysql/manifests/server/account_security.pp Mon Apr 03 19:41:02 2023 +0100 +++ b/modules/mysql/manifests/server/account_security.pp Mon May 08 11:48:41 2023 +0100 @@ -12,7 +12,7 @@ ensure => 'absent', require => Anchor['mysql::server::end'], } - if ($::fqdn != 'localhost.localdomain') { + if ($facts['networking']['fqdn'] != 'localhost.localdomain') { mysql_user { ['root@localhost.localdomain', '@localhost.localdomain']: @@ -20,17 +20,17 @@ require => Anchor['mysql::server::end'], } } - if ($::fqdn and $::fqdn != 'localhost') { + if ($facts['networking']['fqdn'] and $facts['networking']['fqdn'] != 'localhost') { mysql_user { - ["root@${::fqdn}", - "@${::fqdn}"]: + ["root@${facts['networking']['fqdn']}", + "@${facts['networking']['fqdn']}"]: ensure => 'absent', require => Anchor['mysql::server::end'], } } - if ($::fqdn != $::hostname) { - if ($::hostname != 'localhost') { - mysql_user { ["root@${::hostname}", "@${::hostname}"]: + if ($facts['networking']['fqdn'] != $facts['networking']['hostname']) { + if ($facts['networking']['hostname'] != 'localhost') { + mysql_user { ["root@${facts['networking']['hostname']}", "@${facts['networking']['hostname']}"]: ensure => 'absent', require => Anchor['mysql::server::end'], }