Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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'
11 changes: 5 additions & 6 deletions resources/wf_builder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -96,24 +96,23 @@
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

%w(etc/delivery.rb .chef/knife.rb).each do |dir|
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",
Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need log_location: 'STDOUT' to get the logs into automate.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll add that back in and see if it works, I think the permission errors were related to the keys.

trusted_certs_dir: '/etc/chef/trusted_certs'
)
mode '0644'
Expand Down