Restore a few things that got removed:
* Manage /etc/mysql/mysql.conf.d
* Account security ensures
* Check mysql_exists before realizing ressources
These last two points partially revert commit
e1649647f3
This commit is contained in:
parent
31ecdf427d
commit
e5a66002f3
1 changed files with 16 additions and 4 deletions
|
@ -77,8 +77,20 @@ class mysql::server::base {
|
||||||
require => Package['mysql-server'],
|
require => Package['mysql-server'],
|
||||||
}
|
}
|
||||||
|
|
||||||
# Collect all databases and users
|
file { '/etc/mysql/conf.d':
|
||||||
Mysql_database<<| tag == "mysql_${::fqdn}" |>>
|
ensure => directory,
|
||||||
Mysql_user<<| tag == "mysql_${::fqdn}" |>>
|
owner => 'root',
|
||||||
Mysql_grant<<| tag == "mysql_${::fqdn}" |>>
|
group => 0,
|
||||||
|
mode => '0755',
|
||||||
|
}
|
||||||
|
|
||||||
|
if str2bool($::mysql_exists) {
|
||||||
|
include mysql::server::account_security
|
||||||
|
|
||||||
|
# Collect all databases and users
|
||||||
|
Mysql_database<<| tag == "mysql_${::fqdn}" |>>
|
||||||
|
Mysql_user<<| tag == "mysql_${::fqdn}" |>>
|
||||||
|
Mysql_grant<<| tag == "mysql_${::fqdn}" |>>
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue