From 4d07a507d7c4f6aa90cd7476fd953f54f2733f45 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 11 Oct 2016 14:00:48 +0100 Subject: [PATCH] Update chef server to 12.9.1 --- cookbooks/chef/attributes/default.rb | 2 +- cookbooks/chef/templates/default/server.rb.erb | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/cookbooks/chef/attributes/default.rb b/cookbooks/chef/attributes/default.rb index 07a235ff3..137435300 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.0.8-1" +default[:chef][:server][:version] = "12.9.1-1" # Set the default client version default[:chef][:client][:version] = "12.14.89-1" diff --git a/cookbooks/chef/templates/default/server.rb.erb b/cookbooks/chef/templates/default/server.rb.erb index aa36dbd1b..e3687f80b 100644 --- a/cookbooks/chef/templates/default/server.rb.erb +++ b/cookbooks/chef/templates/default/server.rb.erb @@ -16,6 +16,5 @@ nginx['ssl_port'] = 4443 nginx['ssl_certificate'] = '/etc/ssl/certs/openstreetmap.pem' nginx['ssl_certificate_key'] = '/etc/ssl/private/openstreetmap.key' nginx['server_name'] = "chef.openstreetmap.org" -nginx['url'] = "http://chef.openstreetmap.org:4000" opscode_erchef['base_resource_url'] = "https://chef.openstreetmap.org" -- 2.43.2