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:
Jerome Charaoui 2015-04-17 17:18:25 -04:00
parent 31ecdf427d
commit e5a66002f3

View file

@ -77,8 +77,20 @@ class mysql::server::base {
require => Package['mysql-server'],
}
# Collect all databases and users
Mysql_database<<| tag == "mysql_${::fqdn}" |>>
Mysql_user<<| tag == "mysql_${::fqdn}" |>>
Mysql_grant<<| tag == "mysql_${::fqdn}" |>>
file { '/etc/mysql/conf.d':
ensure => directory,
owner => 'root',
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}" |>>
}
}