File tree 1 file changed +3
-2
lines changed
1 file changed +3
-2
lines changed Original file line number Diff line number Diff line change 11
11
12
12
# Debian: Fix permission on directories
13
13
if $managed_dirs {
14
+ $managed_dirs_path = $managed_dirs .map |$path | { $options [' mysqld' ][" ${path} " ] }
14
15
$managed_dirs .each | $entry | {
15
16
$dir = $options [' mysqld' ][" ${entry} " ]
16
17
if ( $dir and $dir != ' /usr' and $dir != ' /tmp' ) {
30
31
if $logbin {
31
32
$logbindir = dirname($logbin )
32
33
33
- # Stop puppet from managing directory if just a filename/prefix is specified or is datadir
34
- if ($logbindir != ' .' and $logbindir != $mysql::server::options [ ' mysqld ' ][ ' datadir ' ] ) {
34
+ # Stop puppet from managing directory if just a filename/prefix is specified or is not already managed
35
+ if ($logbindir != ' .' and !( $logbindir in $managed_dirs_path ) ) {
35
36
file { $logbindir:
36
37
ensure => directory ,
37
38
mode => ' 0700' ,
You can’t perform that action at this time.
0 commit comments