Merge remote-tracking branch 'github/pull/641'

[chef.git] / cookbooks / chef / recipes / default.rb

diff --git a/cookbooks/chef/recipes/default.rb b/cookbooks/chef/recipes/default.rb
index befce968cd5d69cf3de151678d57f14e957caec8..60511bf16104ed3707164acf7500d78b0dbdc266 100644 (file)
--- a/cookbooks/chef/recipes/default.rb
+++ b/cookbooks/chef/recipes/default.rb
@@ -108,17 +108,9 @@ template "/etc/logrotate.d/chef" do
   mode "644"
 end
 
-directory "/etc/chef/trusted_certs" do
-  owner "root"
-  group "root"
-  mode "755"
-end
-
-template "/etc/chef/trusted_certs/verisign.pem" do
-  source "verisign.pem.erb"
-  owner "root"
-  group "root"
-  mode "644"
+# Remove the ancient verisign certificate workaround
+file "/etc/chef/trusted_certs/verisign.pem" do
+  action :delete
 end
 
 directory node[:ohai][:plugin_dir] do