X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/9949b7666e55675ff8e962fc7c44140b80b21125..1751b31885773d33dcf3efb396f198f1d10a2221:/cookbooks/chef/recipes/server.rb diff --git a/cookbooks/chef/recipes/server.rb b/cookbooks/chef/recipes/server.rb index 5eb30d0b6..31b6b196a 100644 --- a/cookbooks/chef/recipes/server.rb +++ b/cookbooks/chef/recipes/server.rb @@ -18,6 +18,8 @@ # include_recipe "apache" +include_recipe "chef::knife" +include_recipe "munin" # cache_dir = Chef::Config[:file_cache_path] # @@ -34,7 +36,7 @@ include_recipe "apache" # 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/20.04/chef-server-core_#{chef_version}-1_amd64.deb" # owner "root" # group "root" # mode 0644 @@ -51,7 +53,7 @@ template "/etc/opscode/chef-server.rb" do source "server.rb.erb" owner "root" group "root" - mode 0o640 + mode "640" notifies :run, "execute[chef-server-reconfigure]" end @@ -97,7 +99,5 @@ template "/etc/cron.daily/chef-server-backup" do source "server-backup.cron.erb" owner "root" group "root" - mode 0o755 + mode "755" end - -munin_plugin "chef_status"