From e0c1cbe28b9a5c0034a5c212ccbefb4c8c9630ea Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 20 Jun 2018 20:34:28 +0100 Subject: [PATCH 1/1] Document changes to chef server version and download location --- cookbooks/chef/attributes/default.rb | 2 +- cookbooks/chef/recipes/server.rb | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cookbooks/chef/attributes/default.rb b/cookbooks/chef/attributes/default.rb index dd886ad2a..4291f2a9c 100644 --- a/cookbooks/chef/attributes/default.rb +++ b/cookbooks/chef/attributes/default.rb @@ -2,7 +2,7 @@ default[:apt][:sources] = node[:apt][:sources] | ["opscode"] # Set the default server version -default[:chef][:server][:version] = "12.13.0-1" +default[:chef][:server][:version] = "12.17.33" # Set the default client version default[:chef][:client][:version] = "13.9.4" diff --git a/cookbooks/chef/recipes/server.rb b/cookbooks/chef/recipes/server.rb index 549123916..12c43840a 100644 --- a/cookbooks/chef/recipes/server.rb +++ b/cookbooks/chef/recipes/server.rb @@ -19,7 +19,8 @@ include_recipe "apache" -# chef_package = "chef-server-core_#{node[:chef][:server][:version]}_amd64.deb" +# chef_version = node[:chef][:server][:version] +# chef_package = "chef-server-core_#{chef_version}-1_amd64.deb" # # directory "/var/cache/chef" do # owner "root" @@ -37,7 +38,7 @@ include_recipe "apache" # end # # remote_file "/var/cache/chef/#{chef_package}" do -# source "https://web-dl.packagecloud.io/chef/stable/packages/ubuntu/#{node[:lsb][:codename]}/#{chef_package}" +# source "https://packages.chef.io/files/stable/chef-server/#{chef_version}/ubuntu/16.04/#{chef_package}" # owner "root" # group "root" # mode 0644 @@ -46,7 +47,7 @@ include_recipe "apache" # # dpkg_package "chef-server-core" do # source "/var/cache/chef/#{chef_package}" -# version node[:chef][:server][:version] +# version "#{chef_version}-1" # notifies :run, "execute[chef-server-reconfigure]" # end -- 2.43.2