From: Tom Hughes Date: Sun, 3 May 2015 15:27:30 +0000 (+0100) Subject: Add organisation name to chef URLs X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/430396d5f0405bccfebd3f3f1146aec7e5b9eacd?hp=098634e073c80dfde4038715bc683985b18c5184 Add organisation name to chef URLs --- diff --git a/cookbooks/chef/files/default/knife.rb b/cookbooks/chef/files/default/knife.rb index d0da91066..538689cd4 100644 --- a/cookbooks/chef/files/default/knife.rb +++ b/cookbooks/chef/files/default/knife.rb @@ -2,7 +2,7 @@ node_name "git" client_key "client.pem" validation_client_name "chef-validator" validation_key "/etc/chef/validation.pem" -chef_server_url "https://chef.openstreetmap.org" +chef_server_url "https://chef.openstreetmap.org/organizations/openstreetmap" cache_type "BasicFile" cache_options :path => ".chef/checksums" cookbook_path ["cookbooks"] diff --git a/cookbooks/chef/templates/default/client.rb.erb b/cookbooks/chef/templates/default/client.rb.erb index dff9d19ed..cdc09b2b2 100644 --- a/cookbooks/chef/templates/default/client.rb.erb +++ b/cookbooks/chef/templates/default/client.rb.erb @@ -23,7 +23,7 @@ ssl_verify_mode :verify_peer # Set the URL for the chef server -chef_server_url "https://chef.openstreetmap.org" +chef_server_url "https://chef.openstreetmap.org/organizations/openstreetmap" # Make our plugins visible to ohai