From 1e94e05c60bd835fe423e0c193d7c12a45ee8bac Mon Sep 17 00:00:00 2001 From: Chris Bednarski Date: Thu, 28 May 2015 17:02:09 -0700 Subject: [PATCH 1/2] Changed phrasing for unseal key notification --- command/init.go | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/command/init.go b/command/init.go index 5e638f5d33..ecbbf91ab0 100644 --- a/command/init.go +++ b/command/init.go @@ -47,17 +47,14 @@ func (c *InitCommand) Run(args []string) int { c.Ui.Output(fmt.Sprintf( "\n"+ - "Vault initialized with %d keys and a key threshold of %d!\n\n"+ - "Please securely distribute the above keys. Whenever a Vault server\n"+ - "is started, it must be unsealed with %d (the threshold) of the\n"+ - "keys above (any of the keys, as long as the total number equals\n"+ - "the threshold).\n\n"+ - "Vault does not store the original master key. If you lose the keys\n"+ - "above such that you no longer have the minimum number (the\n"+ - "threshold), then your Vault will not be able to be unsealed.", + "Vault initialized with %d keys and a key threshold of %d. Please\n"+ + "securely distribute the above keys. When Vault restarts you must\n"+ + "provide %d keys to unseal it. Vault does not store the master key.\n"+ + "Without at least %d keys, your Vault will remain permanently sealed.", shares, threshold, threshold, + threshold, )) return 0 From 99325f2a317eaae2e20068248e58db80471a4c17 Mon Sep 17 00:00:00 2001 From: Chris Bednarski Date: Thu, 28 May 2015 17:07:38 -0700 Subject: [PATCH 2/2] Updated phrasing to note restarts, stop, and other sealing scenarios --- command/init.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/command/init.go b/command/init.go index ecbbf91ab0..4bcac56664 100644 --- a/command/init.go +++ b/command/init.go @@ -48,9 +48,11 @@ func (c *InitCommand) Run(args []string) int { c.Ui.Output(fmt.Sprintf( "\n"+ "Vault initialized with %d keys and a key threshold of %d. Please\n"+ - "securely distribute the above keys. When Vault restarts you must\n"+ - "provide %d keys to unseal it. Vault does not store the master key.\n"+ - "Without at least %d keys, your Vault will remain permanently sealed.", + "securely distribute the above keys. When the Vault is re-sealed,\n"+ + "restarted, or stopped, you must provide at least %d of these keys\n"+ + "to unseal it again.\n\n"+ + "Vault does not store the master key. Without at least %d keys,\n"+ + "your Vault will remain permanently sealed.", shares, threshold, threshold,