Check for full path for log-bin to stop puppet from managing directory “.”

This commit is contained in:
Nick Le Mouton 2015-01-29 16:39:31 +13:00
parent b64ca51cfb
commit dc711561d7

View file

@ -22,7 +22,10 @@ class mysql::server::config {
$logbin = pick($options['mysqld']['log-bin'], $options['mysqld']['log_bin'], false) $logbin = pick($options['mysqld']['log-bin'], $options['mysqld']['log_bin'], false)
if $logbin { if $logbin {
$logbindir = mysql_dirname($logbin) $logbindir = dirname($logbin)
#Stop puppet from managing directory if just a filename/prefix is specified
if $logbindir != '.' {
file { $logbindir: file { $logbindir:
ensure => directory, ensure => directory,
mode => '0755', mode => '0755',
@ -30,6 +33,7 @@ class mysql::server::config {
group => $options['mysqld']['user'], group => $options['mysqld']['user'],
} }
} }
}
if $mysql::server::manage_config_file { if $mysql::server::manage_config_file {
file { 'mysql-config-file': file { 'mysql-config-file':