From 026ebcef58fe6f327d971691361aca29f4a09a56 Mon Sep 17 00:00:00 2001 From: Ryan Uber Date: Sat, 13 Sep 2014 12:19:21 -0700 Subject: [PATCH] website: remove keyring persistence options from agent page --- website/source/docs/agent/options.html.markdown | 7 ------- website/source/docs/commands/keyring.html.markdown | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/website/source/docs/agent/options.html.markdown b/website/source/docs/agent/options.html.markdown index 2a60a4309c..01149ef590 100644 --- a/website/source/docs/agent/options.html.markdown +++ b/website/source/docs/agent/options.html.markdown @@ -85,17 +85,10 @@ The options below are all specified on the command-line. it relies on proper configuration. Nodes in the same datacenter should be on a single LAN. -* `-persist-keyring` - This flag enables persistence of changes to the - encryption keys used in the gossip pools. By default, any modifications to - the keyring via the [consul keys](/docs/command/keys.html) command will be - lost when the agent shuts down. - * `-encrypt` - Specifies the secret key to use for encryption of Consul network traffic. This key must be 16-bytes that are base64 encoded. The easiest way to create an encryption key is to use `consul keygen`. All nodes within a cluster must share the same encryption key to communicate. - If keyring persistence is enabled, the given key will only be used if there is - no pre-existing keyring. Otherwise, Consul will emit a warning and continue. * `-join` - Address of another agent to join upon starting up. This can be specified multiple times to specify multiple agents to join. If Consul is diff --git a/website/source/docs/commands/keyring.html.markdown b/website/source/docs/commands/keyring.html.markdown index 2b65241e6b..8481b588a3 100644 --- a/website/source/docs/commands/keyring.html.markdown +++ b/website/source/docs/commands/keyring.html.markdown @@ -32,7 +32,7 @@ be 1. Usage: `consul keyring [options]` Only one actionable argument may be specified per run, including `-init`, -`-list`, `-install`, `-remove`, and `-update`. +`-list`, `-install`, `-remove`, and `-use`. The list of available flags are: