diff options
| author | Claire McQuin <claire@getchef.com> | 2014-09-05 13:34:10 -0700 |
|---|---|---|
| committer | Claire McQuin <claire@getchef.com> | 2014-09-08 15:21:14 -0700 |
| commit | 6b5245a79d21ebf3a2f7f9f33adc19c72979f5ae (patch) | |
| tree | 508f3581fde543828d226a89fe26a2b6858fb456 /lib/chef/knife/bootstrap | |
| parent | 3fb87cc744d1e1134476496dedc9125a25add859 (diff) | |
| download | chef-6b5245a79d21ebf3a2f7f9f33adc19c72979f5ae.tar.gz | |
Transfer trusted certs during bootstrap
Diffstat (limited to 'lib/chef/knife/bootstrap')
| -rw-r--r-- | lib/chef/knife/bootstrap/archlinux-gems.erb | 9 | ||||
| -rw-r--r-- | lib/chef/knife/bootstrap/chef-aix.erb | 9 | ||||
| -rw-r--r-- | lib/chef/knife/bootstrap/chef-full.erb | 9 |
3 files changed, 27 insertions, 0 deletions
diff --git a/lib/chef/knife/bootstrap/archlinux-gems.erb b/lib/chef/knife/bootstrap/archlinux-gems.erb index bb84340c05..abdce8f0b2 100644 --- a/lib/chef/knife/bootstrap/archlinux-gems.erb +++ b/lib/chef/knife/bootstrap/archlinux-gems.erb @@ -23,6 +23,15 @@ EOP chmod 0600 /etc/chef/encrypted_data_bag_secret <% end -%> +<% if trusted_certs_dir -%> +mkdir -p /etc/chef/trusted_certs +<% Dir[File.join(trusted_certs_dir, "*")].each do |entry| %> +cat > <%= File.join("/etc/chef/trusted_certs", File.basename(entry)) %> <<'EOP' +<%= IO.read(File.expand_path(entry)) %> +EOP +<% end %> +<% end -%> + <%# Generate Ohai Hints -%> <% unless @chef_config[:knife][:hints].nil? || @chef_config[:knife][:hints].empty? -%> mkdir -p /etc/chef/ohai/hints diff --git a/lib/chef/knife/bootstrap/chef-aix.erb b/lib/chef/knife/bootstrap/chef-aix.erb index 59993b478a..e8b3188e89 100644 --- a/lib/chef/knife/bootstrap/chef-aix.erb +++ b/lib/chef/knife/bootstrap/chef-aix.erb @@ -36,6 +36,15 @@ EOP chmod 0600 /etc/chef/encrypted_data_bag_secret <% end -%> +<% if trusted_certs_dir -%> +mkdir -p /etc/chef/trusted_certs +<% Dir[File.join(trusted_certs_dir, "*")].each do |entry| %> +cat > <%= File.join("/etc/chef/trusted_certs", File.basename(entry)) %> <<'EOP' +<%= IO.read(File.expand_path(entry)) %> +EOP +<% end %> +<% end -%> + <%# Generate Ohai Hints -%> <% unless @chef_config[:knife][:hints].nil? || @chef_config[:knife][:hints].empty? -%> mkdir -p /etc/chef/ohai/hints diff --git a/lib/chef/knife/bootstrap/chef-full.erb b/lib/chef/knife/bootstrap/chef-full.erb index a4e85b9d67..56c216dad0 100644 --- a/lib/chef/knife/bootstrap/chef-full.erb +++ b/lib/chef/knife/bootstrap/chef-full.erb @@ -50,6 +50,15 @@ EOP chmod 0600 /etc/chef/encrypted_data_bag_secret <% end -%> +<% if trusted_certs_dir -%> +mkdir -p /etc/chef/trusted_certs +<% Dir[File.join(trusted_certs_dir, "*")].each do |entry| %> +cat > <%= File.join("/etc/chef/trusted_certs", File.basename(entry)) %> <<'EOP' +<%= IO.read(File.expand_path(entry)) %> +EOP +<% end %> +<% end -%> + <%# Generate Ohai Hints -%> <% unless @chef_config[:knife][:hints].nil? || @chef_config[:knife][:hints].empty? -%> mkdir -p /etc/chef/ohai/hints |