Merge pull request #1348 from qha/main

david22swan · web-flow · commit af4e7e52eae7 · 2021-01-04T17:57:58.000Z
Repair check of logbindir
diff --git a/manifests/server/managed_dirs.pp b/manifests/server/managed_dirs.pp
@@ -23,6 +23,8 @@
         }
       }
     }
+  } else {
+    $managed_dirs_path = []
   }
 
   $logbin = pick($options['mysqld']['log-bin'], $options['mysqld']['log_bin'], false)
@@ -31,7 +33,7 @@
     $logbindir = dirname($logbin)
 
     #Stop puppet from managing directory if just a filename/prefix is specified or is not already managed
-    if ($logbindir != '.' or !($logbindir in $managed_dirs_path)) {
+    if (!($logbindir == '.' or $logbindir in $managed_dirs_path)) {
       file { $logbindir:
         ensure => directory,
         mode   => '0700',

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,8 @@`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`	`}`
	`26`	`+ } else {`
	`27`	`+ $managed_dirs_path = []`
`26`	`28`	`}`
`27`	`29`
`28`	`30`	`$logbin = pick($options['mysqld']['log-bin'], $options['mysqld']['log_bin'], false)`
`@@ -31,7 +33,7 @@`
`31`	`33`	`$logbindir = dirname($logbin)`
`32`	`34`
`33`	`35`	`#Stop puppet from managing directory if just a filename/prefix is specified or is not already managed`
`34`		`- if ($logbindir != '.' or !($logbindir in $managed_dirs_path)) {`
	`36`	`+ if (!($logbindir == '.' or $logbindir in $managed_dirs_path)) {`
`35`	`37`	`file { $logbindir:`
`36`	`38`	`ensure => directory,`
`37`	`39`	`mode => '0700',`