From 881ab4e76e71fe6542aabacba90a82de669214fd Mon Sep 17 00:00:00 2001 From: Ulrik Haugen Date: Fri, 4 Dec 2020 15:24:10 +0100 Subject: [PATCH 1/2] Repair check of logbindir Presumably the intention was to check that it is *both* not relative and not already managed. After update to 10.8 the mysql module tries and fails to manage '.' on nodes where i have log-bin set to a relative path. --- manifests/server/managed_dirs.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/server/managed_dirs.pp b/manifests/server/managed_dirs.pp index 87a765b63..d7851cc21 100644 --- a/manifests/server/managed_dirs.pp +++ b/manifests/server/managed_dirs.pp @@ -31,7 +31,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', From 338f70ea63e2b2383dbc2351b6dde3a8a50a4d0d Mon Sep 17 00:00:00 2001 From: Ulrik Haugen Date: Mon, 4 Jan 2021 15:50:07 +0100 Subject: [PATCH 2/2] Make sure $managed_dirs_path is defined ...even if $managed_dirs is empty. --- manifests/server/managed_dirs.pp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/manifests/server/managed_dirs.pp b/manifests/server/managed_dirs.pp index d7851cc21..d7841993a 100644 --- 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)