better fix double declaration

puppetlabs · May 9, 2019 · abd4e3b · abd4e3b
1 parent d2ad637
commit abd4e3b
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/manifests/server/managed_dirs.pp b/manifests/server/managed_dirs.pp
@@ -11,6 +11,7 @@
 
   #Debian: Fix permission on directories
   if $managed_dirs {
+    $managed_dirs_path = $managed_dirs.map |$path| { $options['mysqld']["${path}"] }
     $managed_dirs.each | $entry | {
       $dir = $options['mysqld']["${entry}"]
       if ( $dir and $dir != '/usr' and $dir != '/tmp' ) {
@@ -30,8 +31,8 @@
   if $logbin {
     $logbindir = dirname($logbin)
 
-    #Stop puppet from managing directory if just a filename/prefix is specified or is datadir
-    if ($logbindir != '.' and $logbindir != $mysql::server::options['mysqld']['datadir'] ) {
+    #Stop puppet from managing directory if just a filename/prefix is specified or is not already managed
+    if ($logbindir != '.' and !($logbindir in $managed_dirs_path)) {
       file { $logbindir:
         ensure => directory,
         mode   => '0700',