status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/hashicorp/consul

This commit is contained in:
mkeeler 2019-01-28 22:25:26 +00:00
parent 04e50baed7 abf32ef5e8
commit 19e86d28e3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
website/source/docs/guides/index.html.md
View File

@ -38,10 +38,10 @@ The following guides are available:
* [Creating Certificates](https://learn.hashicorp.com/consul/advanced/day-1-operations/certificates) - This guide describes how to setup CA and certificates to secure a Consul cluster with TLS. * [Creating Certificates](https://learn.hashicorp.com/consul/advanced/day-1-operations/certificates) - This guide describes how to setup CA and certificates to secure a Consul cluster with TLS.
* [Deployment Guide](https://learn.hashicorp.com/consul/advanced/day-1-operations/deployment-guide) - This deployment guide covers the steps required to install and configure a single HashiCorp Consul cluster as defined in the Consul Reference Architecture.
* [Datacenter Backups](https://learn.hashicorp.com/consul/advanced/day-1-operations/backup) - Consul provide the snapshot tool for backing up and restoring data. In this guide you will learn how to use both. * [Datacenter Backups](https://learn.hashicorp.com/consul/advanced/day-1-operations/backup) - Consul provide the snapshot tool for backing up and restoring data. In this guide you will learn how to use both.
* [Deployment Guide](https://learn.hashicorp.com/consul/advanced/day-1-operations/deployment-guide) - This deployment guide covers the steps required to install and configure a single HashiCorp Consul cluster as defined in the Consul Reference Architecture.
* [DNS Caching](https://learn.hashicorp.com/consul/day-2-operations/advanced-operations/dns-caching) - Enabling TTLs for DNS query caching * [DNS Caching](https://learn.hashicorp.com/consul/day-2-operations/advanced-operations/dns-caching) - Enabling TTLs for DNS query caching
* [DNS Forwarding](/docs/guides/forwarding.html) - Forward DNS queries from Bind to Consul * [DNS Forwarding](/docs/guides/forwarding.html) - Forward DNS queries from Bind to Consul

8
website/source/layouts/docs.erb
View File

@ -414,9 +414,6 @@
<li<%= sidebar_current("docs-guides-bootstrapping") %>> <li<%= sidebar_current("docs-guides-bootstrapping") %>>
<a href="/docs/guides/bootstrapping.html">Bootstrapping</a> <a href="/docs/guides/bootstrapping.html">Bootstrapping</a>
</li> </li>
<li<%= sidebar_current("docs-guides-backups") %>>
<a href="https://learn.hashicorp.com/consul/advanced/day-1-operations/backup">Datacenter Backups</a>
</li>
<li<%= sidebar_current("docs-guides-connect-production") %>> <li<%= sidebar_current("docs-guides-connect-production") %>>
<a href="/docs/guides/connect-production.html">Connect in Production</a> <a href="/docs/guides/connect-production.html">Connect in Production</a>
</li> </li>
@ -438,11 +435,14 @@
<li<%= sidebar_current("docs-guides-creating-certificates") %>> <li<%= sidebar_current("docs-guides-creating-certificates") %>>
<a href="https://learn.hashicorp.com/consul/advanced/day-1-operations/certificates">Creating TLS Certificates</a> <a href="https://learn.hashicorp.com/consul/advanced/day-1-operations/certificates">Creating TLS Certificates</a>
</li> </li>
<li<%= sidebar_current("docs-guides-backups") %>>
<a href="https://learn.hashicorp.com/consul/advanced/day-1-operations/backup">Datacenter Backups</a>
</li>
<li<%= sidebar_current("docs-guides-deployment-guide") %>> <li<%= sidebar_current("docs-guides-deployment-guide") %>>
<a href="https://learn.hashicorp.com/consul/advanced/day-1-operations/deployment-guide">Deployment Guide</a> <a href="https://learn.hashicorp.com/consul/advanced/day-1-operations/deployment-guide">Deployment Guide</a>
</li> </li>
<li<%= sidebar_current("docs-guides-dns-cache") %>> <li<%= sidebar_current("docs-guides-dns-cache") %>>
<a href="https://learn.hashicorp.com/consul/day-2-operations/advanced-operations/dns-cache">DNS Caching</a> <a href="https://learn.hashicorp.com/consul/day-2-operations/advanced-operations/dns-caching">DNS Caching</a>
</li> </li>
<li<%= sidebar_current("docs-guides-forwarding") %>> <li<%= sidebar_current("docs-guides-forwarding") %>>
<a href="/docs/guides/forwarding.html">DNS Forwarding</a> <a href="/docs/guides/forwarding.html">DNS Forwarding</a>