X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e0c1cbe28b9a5c0034a5c212ccbefb4c8c9630ea..0aaea8096fcdd565f0f1990a84ad68e9aeb90113:/cookbooks/chef/recipes/server.rb?ds=sidebyside diff --git a/cookbooks/chef/recipes/server.rb b/cookbooks/chef/recipes/server.rb index 12c43840a..f965592a1 100644 --- a/cookbooks/chef/recipes/server.rb +++ b/cookbooks/chef/recipes/server.rb @@ -1,8 +1,8 @@ # -# Cookbook Name:: chef +# Cookbook:: chef # Recipe:: server # -# Copyright 2010, OpenStreetMap Foundation +# Copyright:: 2010, OpenStreetMap Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,26 +18,23 @@ # include_recipe "apache" +include_recipe "munin" +# cache_dir = Chef::Config[:file_cache_path] +# # chef_version = node[:chef][:server][:version] # chef_package = "chef-server-core_#{chef_version}-1_amd64.deb" # -# directory "/var/cache/chef" do -# owner "root" -# group "root" -# mode 0755 -# end +# Dir.glob("#{cache_dir}/chef-server-core_*.deb").each do |deb| +# next if deb == "#{cache_dir}/#{chef_package}" # -# Dir.glob("/var/cache/chef/chef-server-core_*.deb").each do |deb| -# next if deb == "/var/cache/chef/#{chef_package}" - # file deb do # action :delete # backup false # end # end # -# remote_file "/var/cache/chef/#{chef_package}" do +# remote_file "#{cache_dir}/#{chef_package}" do # source "https://packages.chef.io/files/stable/chef-server/#{chef_version}/ubuntu/16.04/#{chef_package}" # owner "root" # group "root" @@ -46,7 +43,7 @@ include_recipe "apache" # end # # dpkg_package "chef-server-core" do -# source "/var/cache/chef/#{chef_package}" +# source "#{cache_dir}/#{chef_package}" # version "#{chef_version}-1" # notifies :run, "execute[chef-server-reconfigure]" # end