From cdd1be4be5d7c25741a981b9813aedcf3da7862e Mon Sep 17 00:00:00 2001 From: jtimberman Date: Sun, 14 Nov 2010 10:08:48 -0700 Subject: [PATCH] fix opscode platform uri and clarify settings --- templates/commands/init/Vagrantfile.erb | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/templates/commands/init/Vagrantfile.erb b/templates/commands/init/Vagrantfile.erb index 11ffe3aeb..225db672c 100644 --- a/templates/commands/init/Vagrantfile.erb +++ b/templates/commands/init/Vagrantfile.erb @@ -40,12 +40,22 @@ Vagrant::Config.run do |config| # Enable provisioning with chef server, specifying the chef server URL, # and the path to the validation key (relative to this Vagrantfile). # - # config.vm.provisioner = :chef_server - # config.chef.chef_server_url = "http://api.opscode.com/organizations/organization" - # config.chef.validation_key_path = "kiip-validator.pem" + # The Opscode Platform uses HTTPS. Substitute your organization for + # ORGNAME in the URL and validation key. # - # If you're using the OpsCode platform, you'll have to set this as well. - # If you're using your own chef server, you may have to set it, but it depends - # on how your Chef server is configured. - # config.chef.validation_client_name = "organization-validator" + # If you have your own Chef Server, use the appropriate URL, which may be + # HTTP instead of HTTPS depending on your configuration. Also change the + # validation key to validation.pem. + # + # config.vm.provisioner = :chef_server + # config.chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME" + # config.chef.validation_key_path = "ORGNAME-validator.pem" + # + # If you're using the Opscode platform, your validator client is + # ORGNAME-validator, replacing ORGNAME with your organization name. + # + # IF you have your own Chef Server, the default validation client name is + # chef-validator, unless you changed the configuration. + # + # config.chef.validation_client_name = "ORGNAME-validator" end