From 0f7bdd5353f659a1827164f0a7554df6e6946316 Mon Sep 17 00:00:00 2001
From: Stephen Lauck <lauck@chef.io>
Date: Wed, 15 Feb 2017 19:56:38 -0500
Subject: [PATCH 1/2] Fix error in pathing for knife.rb and client.pem

fix permissions on keys
---
 metadata.rb             |  2 +-
 resources/wf_builder.rb | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/metadata.rb b/metadata.rb
index 22f6e57..f1e7e68 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -7,6 +7,6 @@
 long_description 'Resource Cookbook for Managing Chef Software Inc Product Suite'
 issues_url 'https://github.com/ncerny/chef_stack/issues' if respond_to?(:issues_url)
 source_url 'https://github.com/ncerny/chef_stack' if respond_to?(:source_url)
-version '0.5.2'
+version '0.5.10'
 
 depends 'chef-ingredient'
diff --git a/resources/wf_builder.rb b/resources/wf_builder.rb
index 8d87e3d..25d6250 100644
--- a/resources/wf_builder.rb
+++ b/resources/wf_builder.rb
@@ -96,15 +96,15 @@
     chef_file "#{workspace}/#{dir}/builder_key" do
       source new_resource.builder_pem
       mode '0600'
-      user 'root'
-      group 'root'
+      user 'dbuild'
+      group 'dbuild'
     end
 
     chef_file "#{workspace}/#{dir}/#{chef_user}.pem" do
       source new_resource.chef_user_pem
       mode '0600'
-      user 'root'
-      group 'root'
+      user 'dbuild'
+      group 'dbuild'
     end
   end
 
@@ -112,8 +112,7 @@
     file "#{workspace}/#{dir}" do
       content ensurekv(::File.read('/etc/chef/client.rb'),
                        node_name: new_resource.chef_user,
-                       log_location: 'STDOUT',
-                       client_key: "#{workspace}/#{dir}/#{new_resource.chef_user}.pem",
+                       client_key: "#{workspace}/.chef/#{new_resource.chef_user}.pem",
                        trusted_certs_dir: '/etc/chef/trusted_certs'
                       )
       mode '0644'

From 7f96344eb5b067daf0f82f31dd27572ce8c83f1d Mon Sep 17 00:00:00 2001
From: Stephen Lauck <lauck@chef.io>
Date: Thu, 16 Feb 2017 20:04:05 -0500
Subject: [PATCH 2/2] keep log location

---
 resources/wf_builder.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/wf_builder.rb b/resources/wf_builder.rb
index 25d6250..492f4d3 100644
--- a/resources/wf_builder.rb
+++ b/resources/wf_builder.rb
@@ -112,6 +112,7 @@
     file "#{workspace}/#{dir}" do
       content ensurekv(::File.read('/etc/chef/client.rb'),
                        node_name: new_resource.chef_user,
+                       log_location: 'STDOUT',
                        client_key: "#{workspace}/.chef/#{new_resource.chef_user}.pem",
                        trusted_certs_dir: '/etc/chef/trusted_certs'
                       )