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

cli flag formatting for agent docs and one guide

This commit is contained in:
McKenna Jones 2016-09-26 19:47:35 -07:00
parent 865e9ea5c3
commit 34043357da
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
website/source/docs/agent/encryption.html.markdown
View File

@ -34,7 +34,7 @@ the output of [`consul agent`](/docs/commands/agent.html) will include "Encrypte
$ cat encrypt.json $ cat encrypt.json
{"encrypt": "cg8StVXbQJ0gPvMd9o7yrg=="} {"encrypt": "cg8StVXbQJ0gPvMd9o7yrg=="}
$ consul agent -data-dir=/tmp/consul -config-file encrypt.json $ consul agent -data-dir=/tmp/consul -config-file=encrypt.json
==> WARNING: LAN keyring exists but -encrypt given, using keyring ==> WARNING: LAN keyring exists but -encrypt given, using keyring
==> WARNING: WAN keyring exists but -encrypt given, using keyring ==> WARNING: WAN keyring exists but -encrypt given, using keyring
==> Starting Consul agent... ==> Starting Consul agent...
@ -93,4 +93,3 @@ also disallow any non-TLS connections. To force clients to use TLS,
TLS is used to secure the RPC calls between agents, but gossip between nodes is done over UDP TLS is used to secure the RPC calls between agents, but gossip between nodes is done over UDP
and is secured using a symmetric key. See above for enabling gossip encryption. and is secured using a symmetric key. See above for enabling gossip encryption.

10
website/source/docs/agent/watches.html.markdown
View File

@ -86,7 +86,7 @@ Here is an example configuration:
Or, using the watch command: Or, using the watch command:
$ consul watch -type key -key foo/bar/baz /usr/bin/my-key-handler.sh $ consul watch -type=key -key=foo/bar/baz /usr/bin/my-key-handler.sh
An example of the output of this command: An example of the output of this command:
@ -123,7 +123,7 @@ Here is an example configuration:
Or, using the watch command: Or, using the watch command:
$ consul watch -type keyprefix -prefix foo/ /usr/bin/my-prefix-handler.sh $ consul watch -type=keyprefix -prefix=foo/ /usr/bin/my-prefix-handler.sh
An example of the output of this command: An example of the output of this command:
@ -237,7 +237,7 @@ Here is an example configuration:
Or, using the watch command: Or, using the watch command:
$ consul watch -type service -service redis /usr/bin/my-service-handler.sh $ consul watch -type=service -service=redis /usr/bin/my-service-handler.sh
An example of the output of this command: An example of the output of this command:
@ -328,7 +328,7 @@ Here is an example configuration:
Or, using the watch command: Or, using the watch command:
$ consul watch -type event -name web-deploy /usr/bin/my-deploy-handler.sh $ consul watch -type=event -name=web-deploy /usr/bin/my-deploy-handler.sh
An example of the output of this command: An example of the output of this command:
@ -350,4 +350,4 @@ An example of the output of this command:
To fire a new `web-deploy` event the following could be used: To fire a new `web-deploy` event the following could be used:
$ consul event -name web-deploy 1609030 $ consul event -name=web-deploy 1609030

2
website/source/docs/guides/outage.html.markdown
View File

@ -24,7 +24,7 @@ add or remove a server, [see this guide](/docs/guides/servers.html).
If you had only a single server and it has failed, simply restart it. If you had only a single server and it has failed, simply restart it.
Note that a single server configuration requires the Note that a single server configuration requires the
[`-bootstrap`](/docs/agent/options.html#_bootstrap) or [`-bootstrap`](/docs/agent/options.html#_bootstrap) or
[`-bootstrap-expect 1`](/docs/agent/options.html#_bootstrap_expect) flag. If [`-bootstrap-expect=1`](/docs/agent/options.html#_bootstrap_expect) flag. If
the server cannot be recovered, you need to bring up a new server. the server cannot be recovered, you need to bring up a new server.
See the [bootstrapping guide](/docs/guides/bootstrapping.html) for more detail. See the [bootstrapping guide](/docs/guides/bootstrapping.html) for more detail.