Only set a long expiry on assets which exist

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

diff --git a/cookbooks/chef/recipes/default.rb b/cookbooks/chef/recipes/default.rb
index 60511bf16104ed3707164acf7500d78b0dbdc266..a27b99cbdcc4fcb5c25491f4aaf5f5b1b9208a4f 100644 (file)
--- a/cookbooks/chef/recipes/default.rb
+++ b/cookbooks/chef/recipes/default.rb
@@ -108,11 +108,6 @@ template "/etc/logrotate.d/chef" do
   mode "644"
 end
 
-# Remove the ancient verisign certificate workaround
-file "/etc/chef/trusted_certs/verisign.pem" do
-  action :delete
-end
-
 directory node[:ohai][:plugin_dir] do
   owner "root"
   group "root"
@@ -142,8 +137,3 @@ end
 service "chef-client.timer" do
   action [:enable, :start]
 end
-
-service "chef-client.service" do
-  action :disable
-  subscribes :stop, "service[chef-client.timer]"
-end