Add organisation name to chef URLs

diff --git a/cookbooks/chef/files/default/knife.rb b/cookbooks/chef/files/default/knife.rb
index d0da91066b599be1b3bd2270d6e0dbc45f7dde30..538689cd4f95dc01e34c6e7d104592d00637495d 100644 (file)
--- 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"
 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"]
 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 dff9d19ed8dbbb9ce1ef3eb9f3f5143b9b698620..cdc09b2b26cab3d0c75a53c01ae97b8c4b118d24 100644 (file)
--- 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
 
 
 # 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
 
 
 # Make our plugins visible to ohai