From aaa97b6d2cc70cca80a8f191b3b231d26c94396b Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Tue, 24 Feb 2026 19:00:24 +0000
Subject: [PATCH] Avoid trying to link to a deleted chef client key

---
 cookbooks/chef/recipes/default.rb | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/cookbooks/chef/recipes/default.rb b/cookbooks/chef/recipes/default.rb
index 4778bea15..6facd7e0a 100644
--- a/cookbooks/chef/recipes/default.rb
+++ b/cookbooks/chef/recipes/default.rb
@@ -149,20 +149,21 @@ template "/etc/#{chef_name}/client.rb" do
   variables :chef_name => chef_name
 end
 
-if node[:chef][:client][:cinc] && ::File.exist?("/etc/chef/client.pem")
+if node[:chef][:client][:cinc]
   link "/etc/#{chef_name}/client.pem" do
     to "/etc/chef/client.pem"
     link_type :hard
     owner "root"
     group "root"
     mode "0400"
+    only_if { ::File.exist?("/etc/chef/client.pem") }
   end
-else
-  file "/etc/#{chef_name}/client.pem" do
-    owner "root"
-    group "root"
-    mode "400"
-  end
+end
+
+file "/etc/#{chef_name}/client.pem" do
+  owner "root"
+  group "root"
+  mode "400"
 end
 
 template "/etc/#{chef_name}/report.rb" do
-- 
2.39.5