luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Merge Consul OSS branch 'master' at commit 42dae36923ff08eb14658e78b22d56af78eb7b84

This commit is contained in:
hashicorp-ci 2019-07-19 02:00:21 +00:00
parent 07b9ed94e8 45e443f7a3
commit 466dc60909
2 changed files with 45 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
website/source/docs/agent/encryption.html.md
View File

@ -101,7 +101,9 @@ and is secured using a symmetric key. See above for enabling gossip encryption.
## Configuring TLS on an existing cluster
As of version 0.8.4, Consul supports migrating to TLS-encrypted traffic on a running cluster
without downtime. This process assumes a starting point with no TLS settings configured, and involves
an intermediate step in order to get to full TLS encryption. Review this step-by-step
[guide](https://learn.hashicorp.com/consul/security-networking/certificates) to learn how.
without downtime. This process assumes a starting point with no TLS settings configured and involves
an intermediate step in order to get to full TLS encryption. Review the
[Securing RPC Communication with TLS Encryption guide](https://learn.hashicorp.com/consul/security-networking/certificates)
for the step-by-step process to configure TLS on a new or existing cluster. Note the call outs there
for existing cluster configuration.

42
website/source/docs/agent/services.html.md
View File

@ -249,7 +249,7 @@ Multiple services definitions can be provided at once using the plural
{
"args": ["/bin/check_redis", "-p", "6000"],
"interval": "5s",
"ttl": "20s"
"timeout": "20s"
}
]
},
@ -266,7 +266,7 @@ Multiple services definitions can be provided at once using the plural
{
"args": ["/bin/check_redis", "-p", "7000"],
"interval": "30s",
"ttl": "60s"
"timeout": "60s"
}
]
},
@ -275,6 +275,44 @@ Multiple services definitions can be provided at once using the plural
}
```
In HCL you can specify the plural `services` key (although not `service`) multiple times:
```hcl
services {
id = "red0"
name = "redis"
tags = [
"primary"
]
address = ""
port = 6000
checks = [
{
args = ["/bin/check_redis", "-p", "6000"]
interval = "5s"
timeout = "20s"
}
]
}
services {
id = "red1"
name = "redis"
tags = [
"delayed",
"secondary"
]
address = ""
port = 7000
checks = [
{
args = ["/bin/check_redis", "-p", "7000"]
interval = "30s"
timeout = "60s"
}
]
}
```
## Service and Tag Names with DNS
Consul exposes service definitions and tags over the [DNS](/docs/agent/dns.html)