From 2e4f854725ab915f2051755db87279c06d7611ef Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Mon, 8 Dec 2014 17:42:29 -0800 Subject: [PATCH] Vagrant Cloud -> Atlas --- lib/vagrant/action/builtin/box_add.rb | 2 +- lib/vagrant/shared_helpers.rb | 4 ++-- plugins/commands/box/command/add.rb | 2 +- templates/locales/en.yml | 20 +++++++++---------- website/docs/source/v2/boxes.html.md | 4 ++-- website/docs/source/v2/boxes/base.html.md | 2 +- website/docs/source/v2/boxes/format.html.md | 6 +++--- .../docs/source/v2/boxes/versioning.html.md | 6 +++--- website/docs/source/v2/cli/box.html.md | 8 ++++---- website/docs/source/v2/cli/login.html.md | 2 +- .../source/v2/getting-started/boxes.html.md | 12 +++++------ .../source/v2/getting-started/share.html.md | 4 ++-- website/docs/source/v2/hyperv/usage.html.md | 2 +- website/docs/source/v2/share/index.html.md | 2 +- .../v2/vagrantfile/machine_settings.html.md | 6 +++--- 15 files changed, 40 insertions(+), 42 deletions(-) diff --git a/lib/vagrant/action/builtin/box_add.rb b/lib/vagrant/action/builtin/box_add.rb index 554613b94..13688bae5 100644 --- a/lib/vagrant/action/builtin/box_add.rb +++ b/lib/vagrant/action/builtin/box_add.rb @@ -147,7 +147,7 @@ module Vagrant # element is an authenticated URL. # @param [Hash] env # @param [Bool] expanded True if the metadata URL was expanded with - # a Vagrant Cloud server URL. + # a Atlas server URL. def add_from_metadata(url, env, expanded) original_url = env[:box_url] provider = env[:box_provider] diff --git a/lib/vagrant/shared_helpers.rb b/lib/vagrant/shared_helpers.rb index c2c52ae10..b195c36df 100644 --- a/lib/vagrant/shared_helpers.rb +++ b/lib/vagrant/shared_helpers.rb @@ -5,12 +5,12 @@ require "thread" module Vagrant @@global_lock = Mutex.new - # This is the default endpoint of the Vagrant Cloud in + # This is the default endpoint of the Atlas in # use. API calls will be made to this for various functions # of Vagrant that may require remote access. # # @return [String] - DEFAULT_SERVER_URL = "https://vagrantcloud.com" + DEFAULT_SERVER_URL = "https://atlas.hashicorp.com" # This holds a global lock for the duration of the block. This should # be invoked around anything that is modifying process state (such as diff --git a/plugins/commands/box/command/add.rb b/plugins/commands/box/command/add.rb index 0356ee298..d82d441a8 100644 --- a/plugins/commands/box/command/add.rb +++ b/plugins/commands/box/command/add.rb @@ -47,7 +47,7 @@ module VagrantPlugins end o.separator "" - o.separator "The box descriptor can be the name of a box on Vagrant Cloud," + o.separator "The box descriptor can be the name of a box on HashiCorp's Atlas," o.separator "or a URL, or a local .box file, or a local .json file containing" o.separator "the catalog metadata." o.separator "" diff --git a/templates/locales/en.yml b/templates/locales/en.yml index a201a3833..e28106a20 100644 --- a/templates/locales/en.yml +++ b/templates/locales/en.yml @@ -369,7 +369,7 @@ en: provider. Double-check your requested provider to verify you didn't simply misspell it. - If you're adding a box from Vagrant Cloud, make sure the box is + If you're adding a box from HashiCorp's Atlas, make sure the box is released. Name: %{name} @@ -388,7 +388,7 @@ en: box_add_short_not_found: |- The box '%{name}' could not be found or could not be accessed in the remote catalog. If this is a private - box on Vagrant Cloud, please verify you're logged in via + box on HashiCorp's Atlas, please verify you're logged in via `vagrant login`. Also, please double-check the name. The expanded URL and error message are shown below: @@ -550,16 +550,14 @@ en: %{versions} box_server_not_set: |- - A URL to a Vagrant Cloud server is not set, so boxes cannot - be added with a shorthand ("mitchellh/precise64") format. - You may also be seeing this error if you meant to type in - a path to a box file which doesn't exist locally on your - system. + A URL to an Atlas server is not set, so boxes cannot be added with a + shorthand ("mitchellh/precise64") format. You may also be seeing this + error if you meant to type in a path to a box file which doesn't exist + locally on your system. - To set a URL to a Vagrant Cloud server, set the - `VAGRANT_SERVER_URL` environmental variable. Or, if you - meant to use a file path, make sure the path to the file - is valid. + To set a URL to an Atlas server, set the `VAGRANT_SERVER_URL` + environmental variable. Or, if you meant to use a file path, make sure + the path to the file is valid. box_update_multi_provider: |- You requested to update the box '%{name}'. This box has multiple providers. You must explicitly select a single diff --git a/website/docs/source/v2/boxes.html.md b/website/docs/source/v2/boxes.html.md index e3c1661de..491a5a631 100644 --- a/website/docs/source/v2/boxes.html.md +++ b/website/docs/source/v2/boxes.html.md @@ -14,7 +14,7 @@ boxes. You can read the documentation on the [vagrant box](/v2/cli/box.html) command for more information. The easiest way to use a box is to add a box from the -[publicly available catalog of Vagrant boxes](https://vagrantcloud.com). +[publicly available catalog of Vagrant boxes](https://atlas.hashicorp.com). You can also add and share your own customized boxes on this website. Boxes also support versioning so that members of your team using Vagrant @@ -27,7 +27,7 @@ sub-pages in the navigation to the left. ## Discovering Boxes The easiest way to find boxes is to look on the -[public Vagrant box catalog](https://vagrantcloud.com) +[public Vagrant box catalog](https://atlas.hashicorp.com) for a box matching your use case. The catalog contains most major operating systems as bases, as well as specialized boxes to get you up and running quickly with LAMP stacks, Ruby, Python, etc. diff --git a/website/docs/source/v2/boxes/base.html.md b/website/docs/source/v2/boxes/base.html.md index e771187a0..61007ce92 100644 --- a/website/docs/source/v2/boxes/base.html.md +++ b/website/docs/source/v2/boxes/base.html.md @@ -239,7 +239,7 @@ provider-specific guides are linked to towards the top of this page. You can distribute the box file however you'd like. However, if you want to support versioning, putting multiple providers at a single URL, pushing updates, analytics, and more, we recommend you add the box to -[Vagrant Cloud](https://vagrantcloud.com). +[HashiCorp's Atlas](https://atlas.hashicorp.com). You can upload both public and private boxes to this service. diff --git a/website/docs/source/v2/boxes/format.html.md b/website/docs/source/v2/boxes/format.html.md index 0eb584026..3fa50479b 100644 --- a/website/docs/source/v2/boxes/format.html.md +++ b/website/docs/source/v2/boxes/format.html.md @@ -23,7 +23,7 @@ Today, there are two different components: box file and so on. * Box Catalog Metadata - This is a JSON document (typically exchanged - during interactions with [Vagrant Cloud](https://vagrantcloud.com)) + during interactions with [HashiCorp's Atlas](https://atlas.hashicorp.com)) that specifies the name of the box, a description, available versions, available providers, and URLs to the actual box files (next component) for each provider and version. If this catalog @@ -78,8 +78,8 @@ providers from a single file, and more.
You don't need to manually make the metadata. If you -have an account with Vagrant Cloud, you -can create boxes there, and Vagrant Cloud automatically creates +have an account with HashiCorp's Atlas, you +can create boxes there, and HashiCorp's Atlas automatically creates the metadata for you. The format is still documented here.
diff --git a/website/docs/source/v2/boxes/versioning.html.md b/website/docs/source/v2/boxes/versioning.html.md index 61af2345a..dc4cf3e28 100644 --- a/website/docs/source/v2/boxes/versioning.html.md +++ b/website/docs/source/v2/boxes/versioning.html.md @@ -24,10 +24,10 @@ to update your own custom boxes with versions. That is covered in `vagrant box list` only shows _installed_ versions of boxes. If you want to see all available versions of a box, you'll have to find the box -on [Vagrant Cloud](https://vagrantcloud.com). An easy way to find a box -is to use the url `https://vagrantcloud.com/USER/BOX`. For example, for +on [HashiCorp's Atlas](https://atlas.hashicorp.com). An easy way to find a box +is to use the url `https://atlas.hashicorp.com/USER/BOX`. For example, for the `hashicorp/precise64` box, you can find information about it at -`https://vagrantcloud.com/hashicorp/precise64`. +`https://atlas.hashicorp.com/hashicorp/precise64`. You can check if the box you're using is outdated with `vagrant box outdated`. This can check if the box in your current Vagrant environment is outdated diff --git a/website/docs/source/v2/cli/box.html.md b/website/docs/source/v2/cli/box.html.md index 0a5cff9fb..e3b39b4cb 100644 --- a/website/docs/source/v2/cli/box.html.md +++ b/website/docs/source/v2/cli/box.html.md @@ -26,10 +26,10 @@ This adds a box with the given address to Vagrant. The address can be one of three things: * A shorthand name from the -[public catalog of available Vagrant images](https://vagrantcloud.com), +[public catalog of available Vagrant images](https://atlas.hashicorp.com), such as "hashicorp/precise64". -* File path or HTTP URL to a box in a [catalog](https://vagrantcloud.com). +* File path or HTTP URL to a box in a [catalog](https://atlas.hashicorp.com). For HTTP, basic authentication is supported and `http_proxy` environmental variables are respected. HTTPS is also supported. @@ -93,8 +93,8 @@ you're not using a catalog). to be specified.
-Checksums for versioned boxes or boxes from Vagrant Cloud: -For boxes from Vagrant Cloud, the checksums are embedded in the metadata +Checksums for versioned boxes or boxes from HashiCorp's Atlas: +For boxes from HashiCorp's Atlas, the checksums are embedded in the metadata of the box. The metadata itself is served over TLS and its format is validated.
diff --git a/website/docs/source/v2/cli/login.html.md b/website/docs/source/v2/cli/login.html.md index 5e2e56065..a984cc77d 100644 --- a/website/docs/source/v2/cli/login.html.md +++ b/website/docs/source/v2/cli/login.html.md @@ -8,7 +8,7 @@ sidebar_current: "cli-login" **Command: `vagrant login`** The login command is used to authenticate with a -[Vagrant Cloud](https://vagrantcloud.com) server. Logging is only +[HashiCorp's Atlas](https://atlas.hashicorp.com) server. Logging is only necessary if you're accessing protected boxes or using [Vagrant Share](/v2/share/index.html). diff --git a/website/docs/source/v2/getting-started/boxes.html.md b/website/docs/source/v2/getting-started/boxes.html.md index b16aa893e..6a64f8a71 100644 --- a/website/docs/source/v2/getting-started/boxes.html.md +++ b/website/docs/source/v2/getting-started/boxes.html.md @@ -27,8 +27,8 @@ $ vagrant box add hashicorp/precise32 ``` This will download the box named "hashicorp/precise32" from -[Vagrant Cloud](https://vagrantcloud.com), a place where you can find -and host boxes. While it is easiest to download boxes from Vagrant Cloud +[HashiCorp's Atlas](https://atlas.hashicorp.com), a place where you can find +and host boxes. While it is easiest to download boxes from HashiCorp's Atlas you can also add boxes from a local file, custom URL, etc. Added boxes can be re-used by multiple projects. Each project uses a box @@ -64,11 +64,11 @@ For the remainder of this getting started guide, we'll only use the this getting started guide, the first question you'll probably have is "where do I find more boxes?" -The best place to find more boxes is [Vagrant Cloud](https://vagrantcloud.com). -Vagrant Cloud has a public directory of freely available boxes that -run various platforms and technologies. Vagrant Cloud also has a great search +The best place to find more boxes is [HashiCorp's Atlas](https://atlas.hashicorp.com). +HashiCorp's Atlas has a public directory of freely available boxes that +run various platforms and technologies. HashiCorp's Atlas also has a great search feature to allow you to find the box you care about. -In addition to finding free boxes, Vagrant Cloud lets you host your own +In addition to finding free boxes, HashiCorp's Atlas lets you host your own boxes, as well as private boxes if you intend on creating boxes for your own organization. diff --git a/website/docs/source/v2/getting-started/share.html.md b/website/docs/source/v2/getting-started/share.html.md index 96c6ffe6a..694bd5d15 100644 --- a/website/docs/source/v2/getting-started/share.html.md +++ b/website/docs/source/v2/getting-started/share.html.md @@ -15,10 +15,10 @@ Vagrant Share lets you share your Vagrant environment to anyone around the world. It will give you a URL that will route directly to your Vagrant environment from any device in the world that is connected to the internet. -## Login to Vagrant Cloud +## Login to HashiCorp's Atlas Before being able to share your Vagrant environment, you'll need an account on -[Vagrant Cloud](https://vagrantcloud.com). Don't worry, it's free. +[HashiCorp's Atlas](https://atlas.hashicorp.com). Don't worry, it's free. Once you have an account, log in using `vagrant login`: diff --git a/website/docs/source/v2/hyperv/usage.html.md b/website/docs/source/v2/hyperv/usage.html.md index 7f3d9ccbe..e91c7e92e 100644 --- a/website/docs/source/v2/hyperv/usage.html.md +++ b/website/docs/source/v2/hyperv/usage.html.md @@ -17,5 +17,5 @@ admin rights. Vagrant will show you an error if it doesn't have the proper permissions. Boxes for Hyper-V can be easily found on -[Vagrant Cloud](https://vagrantcloud.com). To get started, you might +[HashiCorp's Atlas](https://atlas.hashicorp.com). To get started, you might want to try the `hashicorp/precise64` box. diff --git a/website/docs/source/v2/share/index.html.md b/website/docs/source/v2/share/index.html.md index 078fd5e59..20fde2781 100644 --- a/website/docs/source/v2/share/index.html.md +++ b/website/docs/source/v2/share/index.html.md @@ -34,4 +34,4 @@ to the left. We also have a section where we go into detail about the security implications of this feature. Vagrant Share requires an account with -[Vagrant Cloud](https://vagrantcloud.com) to be used. +[HashiCorp's Atlas](https://atlas.hashicorp.com) to be used. diff --git a/website/docs/source/v2/vagrantfile/machine_settings.html.md b/website/docs/source/v2/vagrantfile/machine_settings.html.md index a6f69c194..8ea060de5 100644 --- a/website/docs/source/v2/vagrantfile/machine_settings.html.md +++ b/website/docs/source/v2/vagrantfile/machine_settings.html.md @@ -20,7 +20,7 @@ for the machine to boot and be accessible. By default this is 300 seconds. `config.vm.box` - This configures what [box](/v2/boxes.html) the machine will be brought up against. The value here should be the name of an installed box or a shorthand name of a box in -[Vagrant Cloud](https://vagrantcloud.com). +[HashiCorp's Atlas](https://atlas.hashicorp.com).
@@ -28,7 +28,7 @@ of an installed box or a shorthand name of a box in the configured box on every `vagrant up`. If an update is found, Vagrant will tell the user. By default this is true. Updates will only be checked for boxes that properly support updates (boxes from -[Vagrant Cloud](https://vagrantcloud.com) +[HashiCorp's Atlas](https://atlas.hashicorp.com) or some other versioned box).
@@ -74,7 +74,7 @@ URL, then SSL certs will be verified.
`config.vm.box_url` - The URL that the configured box can be found at. -If `config.vm.box` is a shorthand to a box in [Vagrant Cloud](https://vagrantcloud.com) +If `config.vm.box` is a shorthand to a box in [HashiCorp's Atlas](https://atlas.hashicorp.com) then this value doesn't need to be specified. Otherwise, it should point to the proper place where the box can be found if it isn't installed.