X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/46f4a6b13596f75dc2fabc256346b8bb172440f5..b11b32f71b3fb1bdffdb056b00868e7689d92e2a:/cookbooks/chef/recipes/server.rb diff --git a/cookbooks/chef/recipes/server.rb b/cookbooks/chef/recipes/server.rb index c6ee6f7eb..d5923ccb6 100644 --- a/cookbooks/chef/recipes/server.rb +++ b/cookbooks/chef/recipes/server.rb @@ -18,7 +18,7 @@ # include_recipe "apache" -include_recipe "munin" +include_recipe "chef::knife" # cache_dir = Chef::Config[:file_cache_path] # @@ -35,7 +35,7 @@ include_recipe "munin" # end # # remote_file "#{cache_dir}/#{chef_package}" do -# source "https://packages.chef.io/files/stable/chef-server/#{chef_version}/ubuntu/16.04/#{chef_package}" +# source "https://packages.chef.io/files/stable/chef-server/#{chef_version}/ubuntu/22.04/chef-server-core_#{chef_version}-1_amd64.deb" # owner "root" # group "root" # mode 0644 @@ -48,8 +48,6 @@ include_recipe "munin" # notifies :run, "execute[chef-server-reconfigure]" # end -chef_gem "knife" - template "/etc/opscode/chef-server.rb" do source "server.rb.erb" owner "root" @@ -102,5 +100,3 @@ template "/etc/cron.daily/chef-server-backup" do group "root" mode "755" end - -munin_plugin "chef_status"