Skip to content

Fix error in pathing for knife.rb and client.pem #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stephenlauck wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix error in pathing for knife.rb and client.pem #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f7bdd5
Fix error in pathing for knife.rb and client.pem
Feb 16, 2017
7f96344
keep log location
Feb 17, 2017
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
View file
Open in desktop
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'
10 changes: 5 additions & 5 deletions resources/wf_builder.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -113,7 +113,7 @@
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'
Expand Down