X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e7687ba5011277801d8f0bc433fe192ba9c69ccc..62476c5af5a5d5289c8ff24ad80898c823ded7f5:/cookbooks/chef/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/chef/recipes/default.rb b/cookbooks/chef/recipes/default.rb index 60511bf16..129888c95 100644 --- a/cookbooks/chef/recipes/default.rb +++ b/cookbooks/chef/recipes/default.rb @@ -101,6 +101,8 @@ template "/etc/chef/report.rb" do mode "644" end +package "logrotate" + template "/etc/logrotate.d/chef" do source "logrotate.erb" owner "root" @@ -108,11 +110,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 +139,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