diff --git a/README.md b/README.md index 4cb53a6dc5..4706427acd 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Consul [![Build Status](https://travis-ci.org/hashicorp/consul.png)](https://travis-ci.org/hashicorp/consul) -* Website: http://www.consul.io +* Website: https://www.consul.io * IRC: `#consul` on Freenode * Mailing list: [Google Groups](https://groups.google.com/group/consul-tool/) @@ -32,13 +32,13 @@ Consul servers only on Linux, however. An extensive quick quick start is viewable on the Consul website: -http://www.consul.io/intro/getting-started/install.html +https://www.consul.io/intro/getting-started/install.html ## Documentation Full, comprehensive documentation is viewable on the Consul website: -http://www.consul.io/docs +https://www.consul.io/docs ## Developing Consul diff --git a/api/README.md b/api/README.md index 6fcdd2033d..7e64988f42 100644 --- a/api/README.md +++ b/api/README.md @@ -9,7 +9,7 @@ Currently, all of the Consul APIs included in version 0.6.0 are supported. Documentation ============= -The full documentation is available on [Godoc](http://godoc.org/github.com/hashicorp/consul/api) +The full documentation is available on [Godoc](https://godoc.org/github.com/hashicorp/consul/api) Usage ===== @@ -41,4 +41,3 @@ if err != nil { fmt.Printf("KV: %v", pair) ``` - diff --git a/api/lock.go b/api/lock.go index 11cfdedbc8..08e8e79310 100644 --- a/api/lock.go +++ b/api/lock.go @@ -56,7 +56,7 @@ var ( ) // Lock is used to implement client-side leader election. It is follows the -// algorithm as described here: https://consul.io/docs/guides/leader-election.html. +// algorithm as described here: https://www.consul.io/docs/guides/leader-election.html. type Lock struct { c *Client opts *LockOptions diff --git a/command/agent/command.go b/command/agent/command.go index f48f24a188..e607a7ffb1 100644 --- a/command/agent/command.go +++ b/command/agent/command.go @@ -183,7 +183,7 @@ func (c *Command) readConfig() *Config { if _, err := os.Stat(mdbPath); !os.IsNotExist(err) { c.Ui.Error(fmt.Sprintf("CRITICAL: Deprecated data folder found at %q!", mdbPath)) c.Ui.Error("Consul will refuse to boot with this directory present.") - c.Ui.Error("See https://consul.io/docs/upgrade-specific.html for more information.") + c.Ui.Error("See https://www.consul.io/docs/upgrade-specific.html for more information.") return nil } } diff --git a/demo/vagrant-cluster/README.md b/demo/vagrant-cluster/README.md index ebd8f7d6ab..ad07f76b87 100644 --- a/demo/vagrant-cluster/README.md +++ b/demo/vagrant-cluster/README.md @@ -23,5 +23,5 @@ At this point the two nodes are running and you can SSH in to play with them: ... To learn more about starting Consul, joining nodes and interacting with the agent, -checkout the [getting started guide](http://www.consul.io/intro/getting-started/install.html). +checkout the [getting started guide](https://www.consul.io/intro/getting-started/install.html). diff --git a/ui/README.md b/ui/README.md index 08d4a9b64f..8b95eb5603 100644 --- a/ui/README.md +++ b/ui/README.md @@ -5,7 +5,7 @@ HTTP server that serves this directory, but any common HTTP server is capable of serving it. It uses JavaScript and [Ember](http://emberjs.com) to communicate with -the [Consul API](http://www.consul.io/docs/agent/http.html). The basic +the [Consul API](https://www.consul.io/docs/agent/http.html). The basic features it provides are: - Service view. A list of your registered services, their diff --git a/ui/index.html b/ui/index.html index f87de4214a..4102c50b12 100644 --- a/ui/index.html +++ b/ui/index.html @@ -62,7 +62,7 @@

The default agent token does not have the appropriate permissions to perform the expected action.

{{/if}} -

Learn more in the ACL documentation.

+

Learn more in the ACL documentation.

@@ -74,7 +74,7 @@

ACLs Disabled

ACLs are disabled in this Consul cluster. This is the default behavior, as you have to explicitly enable them.

-

Learn more in the ACL documentation.

+

Learn more in the ACL documentation.

@@ -645,7 +645,7 @@
{{ textarea value=newAcl.Rules class="form-control" }} - For more information on rules, visit the ACL documentation. + For more information on rules, visit the ACL documentation.
@@ -691,7 +691,7 @@
{{ textarea value=model.Rules class="form-control" }} - For more information on rules, visit the ACL documentation. + For more information on rules, visit the ACL documentation.
diff --git a/ui/style-guide.html b/ui/style-guide.html index e08568458f..f4b66da952 100644 --- a/ui/style-guide.html +++ b/ui/style-guide.html @@ -12,7 +12,7 @@

Consul Web UI Style Guide

-

This is style guide for the Consul Web UI. When possible, +

This is style guide for the Consul Web UI. When possible, it's best to follow this guide modifying the UI.

Some reasoning behind choices:

diff --git a/website/source/intro/getting-started/join.html.markdown b/website/source/intro/getting-started/join.html.markdown index d7a68d1cae..456fbdc48e 100644 --- a/website/source/intro/getting-started/join.html.markdown +++ b/website/source/intro/getting-started/join.html.markdown @@ -160,8 +160,8 @@ will automatically join your Consul cluster without any hardcoded configuration. Alternatively, you can join a cluster at startup using the -[`-join` flag](http://www.consul.io/docs/agent/options.html#_join) or -[`start_join` setting](http://www.consul.io/docs/agent/options.html#start_join) +[`-join` flag](https://www.consul.io/docs/agent/options.html#_join) or +[`start_join` setting](https://www.consul.io/docs/agent/options.html#start_join) with hardcoded addresses of other known Consul agents. ## Querying Nodes diff --git a/website/source/intro/hashicorp-ecosystem.html.markdown b/website/source/intro/hashicorp-ecosystem.html.markdown index fba55b4878..30e86bb18e 100644 --- a/website/source/intro/hashicorp-ecosystem.html.markdown +++ b/website/source/intro/hashicorp-ecosystem.html.markdown @@ -8,7 +8,7 @@ description: |- # Consul & the HashiCorp Ecosystem -HashiCorp is the creator of the open source projects Vagrant, Packer, Terraform, Serf, and Consul, and the commercial product Atlas. Terraform is just one piece of the ecosystem HashiCorp has built to make application delivery a versioned, auditable, repeatable, and collaborative process. To learn more about our beliefs on the qualities of the modern datacenter and responsible application delivery, read [The Atlas Mindset: Version Control for Infrastructure](https://hashicorp.com/blog/atlas-mindset.html/?utm_source=consul&utm_campaign=HashicorpEcosystem). +HashiCorp is the creator of the open source projects Vagrant, Packer, Terraform, Serf, and Consul, and the commercial product Atlas. Terraform is just one piece of the ecosystem HashiCorp has built to make application delivery a versioned, auditable, repeatable, and collaborative process. To learn more about our beliefs on the qualities of the modern datacenter and responsible application delivery, read [The Atlas Mindset: Version Control for Infrastructure](https://www.hashicorp.com/blog/atlas-mindset.html/?utm_source=consul&utm_campaign=HashicorpEcosystem). If you are using Consul for service discovery, it’s likely that you have a system to deploy infrastructure which Consul is then connecting. Terraform is our tool for creating, combining, and modifying infrastructure. @@ -19,12 +19,12 @@ Below are summaries of HashiCorp’s open source projects and a graphic showing [Atlas](https://atlas.hashicorp.com/?utm_source=consul&utm_campaign=HashicorpEcosystem) is HashiCorp's only commercial product. It unites Packer, Terraform, and Consul to make application delivery a versioned, auditable, repeatable, and collaborative process. -[Packer](https://packer.io/?utm_source=consul&utm_campaign=HashicorpEcosystem) is a HashiCorp tool for creating machine images and deployable artifacts such as AMIs, OpenStack images, Docker containers, etc. +[Packer](https://www.packer.io/?utm_source=consul&utm_campaign=HashicorpEcosystem) is a HashiCorp tool for creating machine images and deployable artifacts such as AMIs, OpenStack images, Docker containers, etc. -[Terraform](https://terraform.io/?utm_source=consul&utm_campaign=HashicorpEcosystem) is a HashiCorp tool for creating, combining, and modifying infrastructure. In the Atlas workflow Terraform reads from the artifact registry and provisions infrastructure. +[Terraform](https://www.terraform.io/?utm_source=consul&utm_campaign=HashicorpEcosystem) is a HashiCorp tool for creating, combining, and modifying infrastructure. In the Atlas workflow Terraform reads from the artifact registry and provisions infrastructure. -[Consul](https://consul.io/?utm_source=consul&utm_campaign=HashicorpEcosystem) is a HashiCorp tool for service discovery, service registry, and health checks. In the Atlas workflow Consul is configured at the Packer build stage and identifies the service(s) contained in each artifact. Since Consul is configured at the build phase with Packer, when the artifact is deployed with Terraform, it is fully configured with dependencies and service discovery pre-baked. This greatly reduces the risk of an unhealthy node in production due to configuration failure at runtime. +[Consul](https://www.consul.io/?utm_source=consul&utm_campaign=HashicorpEcosystem) is a HashiCorp tool for service discovery, service registry, and health checks. In the Atlas workflow Consul is configured at the Packer build stage and identifies the service(s) contained in each artifact. Since Consul is configured at the build phase with Packer, when the artifact is deployed with Terraform, it is fully configured with dependencies and service discovery pre-baked. This greatly reduces the risk of an unhealthy node in production due to configuration failure at runtime. -[Serf](https://serfdom.io/?utm_source=consul&utm_campaign=HashicorpEcosystem) is a HashiCorp tool for cluster membership and failure detection. Consul uses Serf’s gossip protocol as the foundation for service discovery. +[Serf](https://www.serfdom.io/?utm_source=consul&utm_campaign=HashicorpEcosystem) is a HashiCorp tool for cluster membership and failure detection. Consul uses Serf’s gossip protocol as the foundation for service discovery. [Vagrant](https://www.vagrantup.com/?utm_source=consul&utm_campaign=HashicorpEcosystem) is a HashiCorp tool for managing development environments that mirror production. Vagrant environments reduce the friction of developing a project and reduce the risk of unexpected behavior appearing after deployment. Vagrant boxes can be built in parallel with production artifacts with Packer to maintain parity between development and production. diff --git a/website/source/layouts/_header.erb b/website/source/layouts/_header.erb index fd34c548d3..5079c91b4c 100644 --- a/website/source/layouts/_header.erb +++ b/website/source/layouts/_header.erb @@ -32,7 +32,7 @@