Skip to content

Commit abd4e3b

Browse files
committed
better fix double declaration
1 parent d2ad637 commit abd4e3b

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

manifests/server/managed_dirs.pp

+3-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
#Debian: Fix permission on directories
1313
if $managed_dirs {
14+
$managed_dirs_path = $managed_dirs.map |$path| { $options['mysqld']["${path}"] }
1415
$managed_dirs.each | $entry | {
1516
$dir = $options['mysqld']["${entry}"]
1617
if ( $dir and $dir != '/usr' and $dir != '/tmp' ) {
@@ -30,8 +31,8 @@
3031
if $logbin {
3132
$logbindir = dirname($logbin)
3233

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)) {
3536
file { $logbindir:
3637
ensure => directory,
3738
mode => '0700',

0 commit comments

Comments
 (0)