From b9b16c22dc14f4c9496e5a5ade1d4add8fe77b40 Mon Sep 17 00:00:00 2001 From: Geoffrey Grosenbach Date: Wed, 28 Nov 2018 15:39:28 -0800 Subject: [PATCH] Fixes URL paths to learn.hashicorp.com Removes `.html` when not needed in order to clean up analytics. --- website/source/configuration.html.erb | 6 +- website/source/discovery.html.erb | 12 ++-- website/source/docs/connect/index.html.md | 2 +- .../source/docs/guides/connect-production.md | 2 +- .../docs/guides/consul-template.html.md | 70 +++++++++---------- website/source/index.html.erb | 2 +- website/source/intro/index.html.md | 2 +- website/source/segmentation.html.erb | 4 +- 8 files changed, 50 insertions(+), 50 deletions(-) diff --git a/website/source/configuration.html.erb b/website/source/configuration.html.erb index 81c434365..60175ad9f 100644 --- a/website/source/configuration.html.erb +++ b/website/source/configuration.html.erb @@ -17,7 +17,7 @@ description: |- Download - Explore Docs + Explore Docs @@ -66,7 +66,7 @@ description: |-

Key/Value Store

Feature rich key/value store for dynamic service configuration data. Use it for feature flagging, maintenance modes, and more.

- Learn more + Learn more

@@ -264,7 +264,7 @@ description: |- Download - Explore docs + Explore docs diff --git a/website/source/discovery.html.erb b/website/source/discovery.html.erb index 12157dd90..920f98a19 100644 --- a/website/source/discovery.html.erb +++ b/website/source/discovery.html.erb @@ -18,7 +18,7 @@ description: |- Download - Explore Docs + Explore Docs @@ -64,7 +64,7 @@ description: |-

Service Registry

Consul provides a registry of all the running nodes and services, along with their current health status. This allows operators to understand the environment, and applications and automation tools to interact with dynamic infrastructure using an HTTP API.

- Learn more + Learn more

@@ -93,7 +93,7 @@ description: |-

DNS Query Interface

Consul enables service discovery using a built-in DNS server. This allows existing applications to easily integrate, as almost all applications support using DNS to resolve IP addresses. Using DNS instead of a static IP address allows services to scale up/down and route around failures easily.

- Learn more + Learn more

@@ -130,7 +130,7 @@ web-frontend.service.consul. 0 IN A 10.0.1.109HTTP API with Edge Triggers

Consul provides an HTTP API to query the service registry for nodes, services, and health check information. The API also supports blocking queries, or long-polling for any changes. This allows automation tools to react to services being registered or health status changes to change configurations or traffic routing in real time.

- Learn more + Learn more

@@ -211,7 +211,7 @@ $ curl http://localhost:8500/v1/catalog/nodes?dc=dc2Health Checks

Pairing service discovery with health checking prevents routing requests to unhealthy hosts and enables services to easily provide circuit breakers.

- Learn more + Learn more

@@ -285,7 +285,7 @@ $ curl http://localhost:8500/v1/catalog/nodes?dc=dc2 Download - Explore docs + Explore docs diff --git a/website/source/docs/connect/index.html.md b/website/source/docs/connect/index.html.md index 7d136849c..d104cbe5c 100644 --- a/website/source/docs/connect/index.html.md +++ b/website/source/docs/connect/index.html.md @@ -69,7 +69,7 @@ in microseconds. There are several ways to try Connect in different environments. - * The [Connect introduction](https://learn.hashicorp.com/consul/getting-started/connect.html) in the + * The [Connect introduction](https://learn.hashicorp.com/consul/getting-started/connect) in the Getting Started guide provides a simple walk through of getting two services to communicate via Connect using only Consul directly on your local machine. diff --git a/website/source/docs/guides/connect-production.md b/website/source/docs/guides/connect-production.md index f4e5c2dab..52368e3fe 100644 --- a/website/source/docs/guides/connect-production.md +++ b/website/source/docs/guides/connect-production.md @@ -10,7 +10,7 @@ description: |- Consul Connect can secure all inter-service communication via mutual TLS. It's designed to work with [minimal configuration out of the -box](https://learn.hashicorp.com/consul/getting-started/connect.html), but completing the [security +box](https://learn.hashicorp.com/consul/getting-started/connect), but completing the [security checklist](/docs/connect/security.html) and understanding the [Consul security model](/docs/internals/security.html) are prerequisites for production deployments. diff --git a/website/source/docs/guides/consul-template.html.md b/website/source/docs/guides/consul-template.html.md index e2d9aadc9..7d12d1d99 100644 --- a/website/source/docs/guides/consul-template.html.md +++ b/website/source/docs/guides/consul-template.html.md @@ -8,66 +8,66 @@ description: |- # Consul Template -The Consul template tool provides a programmatic method +The Consul template tool provides a programmatic method for rendering configuration files from a variety of locations, -including Consul KV. It is an ideal option for replacing complicated API +including Consul KV. It is an ideal option for replacing complicated API queries that often require custom formatting. -The template tool is based on Go templates and shares many -of the same attributes. +The template tool is based on Go templates and shares many +of the same attributes. Consul template is a useful tool with several uses, we will focus on two of it's use cases. 1. *Update configuration files*. The Consul template tool can be used -to update service configuration files. A common use case is managing load -balancer configuration files that need to be updated regularly in a dynamic -infrastructure on machines many not be able to directly connect to the Consul cluster. +to update service configuration files. A common use case is managing load +balancer configuration files that need to be updated regularly in a dynamic +infrastructure on machines many not be able to directly connect to the Consul cluster. -1. *Discover data about the Consul cluster and service*. It is possible to collect -information about the services in your Consul cluster. For example, you could -collect a list of all services running on the cluster or you could discover all -service addresses for the Redis service. Note, this use case has limited -scope for production. +1. *Discover data about the Consul cluster and service*. It is possible to collect +information about the services in your Consul cluster. For example, you could +collect a list of all services running on the cluster or you could discover all +service addresses for the Redis service. Note, this use case has limited +scope for production. -In this guide we will briefly discuss how `consul-template` works, -how to install it, and two use cases. +In this guide we will briefly discuss how `consul-template` works, +how to install it, and two use cases. -Before completing this guide, we assume some familiarity with -[Consul KV](https://learn.hashicorp.com/consul/getting-started/kv.html) +Before completing this guide, we assume some familiarity with +[Consul KV](https://learn.hashicorp.com/consul/getting-started/kv) and [Go templates](https://golang.org/pkg/text/template/). -## Introduction to Consul Template +## Introduction to Consul Template -Consul template is a simple, yet powerful tool. When initiated, it -reads one or more template files and queries Consul for all -data needed to render them. Typically, you run `consul-template` as a -daemon which will fetch the initial values and then continue to watch -for updates, re-rendering the template whenever there are relevant changes in -the cluster. You can alternatively use the `-once` flag to fetch and render +Consul template is a simple, yet powerful tool. When initiated, it +reads one or more template files and queries Consul for all +data needed to render them. Typically, you run `consul-template` as a +daemon which will fetch the initial values and then continue to watch +for updates, re-rendering the template whenever there are relevant changes in +the cluster. You can alternatively use the `-once` flag to fetch and render the template once which is useful for testing and -setup scripts that are triggered by some other automation for example a -provisioning tool. Finally, the template can also run arbitrary commands after the update -process completes. For example, it can send the HUP signal to the -load balancer service after a configuration change has been made. +setup scripts that are triggered by some other automation for example a +provisioning tool. Finally, the template can also run arbitrary commands after the update +process completes. For example, it can send the HUP signal to the +load balancer service after a configuration change has been made. The Consul template tool is flexible, it can fit into many -different environments and workflows. Depending on the use-case, you -may have a single `consul-template` instance on a handful of hosts -or may need to run several instances on every host. Each `consul-template` +different environments and workflows. Depending on the use-case, you +may have a single `consul-template` instance on a handful of hosts +or may need to run several instances on every host. Each `consul-template` process can manage multiple unrelated files though and will de-duplicate - the fetches as needed if those files share data dependencies so it can + the fetches as needed if those files share data dependencies so it can reduce the load on Consul servers to share where possible. ## Install Consul Template For this guide, we are using a local Consul agent in development -mode which can be started with `consul agent -dev`. To quickly set -up a local Consul agent, refer to the getting started [guide](https://learn.hashicorp.com/consul/getting-started/install). The +mode which can be started with `consul agent -dev`. To quickly set +up a local Consul agent, refer to the getting started [guide](https://learn.hashicorp.com/consul/getting-started/install). The Consul agent must be running to complete all of the following -steps. +steps. The Consul template tool is not included with the Consul binary and will -need to be installed separately. It can be installed from a precompiled +need to be installed separately. It can be installed from a precompiled binary or compiled from source. We will be installing the precompiled binary. First, download the binary from the [Consul Template releases page](https://releases.hashicorp.com/consul-template/). diff --git a/website/source/index.html.erb b/website/source/index.html.erb index c7d8c0881..f26715c4f 100644 --- a/website/source/index.html.erb +++ b/website/source/index.html.erb @@ -22,7 +22,7 @@ description: |- Download - Get Started + Get Started
View demo of web UI
diff --git a/website/source/intro/index.html.md b/website/source/intro/index.html.md index daf2cde93..0c49e4dac 100644 --- a/website/source/intro/index.html.md +++ b/website/source/intro/index.html.md @@ -86,5 +86,5 @@ forward the request to the remote datacenter and return the result. * See [how Consul compares to other software](/intro/vs/index.html) to assess how it fits into your existing infrastructure. -* Continue onwards with the [getting started guide](https://learn.hashicorp.com/consul/getting-started/install.html) +* Continue onwards with the [getting started guide](https://learn.hashicorp.com/consul/getting-started/install) to get Consul up and running. diff --git a/website/source/segmentation.html.erb b/website/source/segmentation.html.erb index 66c5ecdb3..3c5dc5d6d 100644 --- a/website/source/segmentation.html.erb +++ b/website/source/segmentation.html.erb @@ -18,7 +18,7 @@ description: |- Download - Explore Docs + Explore Docs @@ -200,7 +200,7 @@ Secure Sockets Layer Download - Explore docs + Explore docs