Change recovery options in init to be 'key'-less

This commit is contained in:
Jeff Mitchell 2016-04-18 17:02:07 +00:00
parent b4620d5d04
commit 055a8e04e4
1 changed files with 6 additions and 6 deletions

View File

@ -24,9 +24,9 @@ func (c *InitCommand) Run(args []string) int {
flags.IntVar(&threshold, "key-threshold", 3, "") flags.IntVar(&threshold, "key-threshold", 3, "")
flags.IntVar(&storedShares, "stored-shares", 0, "") flags.IntVar(&storedShares, "stored-shares", 0, "")
flags.Var(&pgpKeys, "pgp-keys", "") flags.Var(&pgpKeys, "pgp-keys", "")
flags.IntVar(&recoveryShares, "recovery-key-shares", 0, "") flags.IntVar(&recoveryShares, "recovery-shares", 0, "")
flags.IntVar(&recoveryThreshold, "recovery-key-threshold", 0, "") flags.IntVar(&recoveryThreshold, "recovery-threshold", 0, "")
flags.Var(&recoveryPgpKeys, "recovery-key-pgp-keys", "") flags.Var(&recoveryPgpKeys, "recovery-pgp-keys", "")
flags.BoolVar(&check, "check", false, "") flags.BoolVar(&check, "check", false, "")
if err := flags.Parse(args); err != nil { if err := flags.Parse(args); err != nil {
return 1 return 1
@ -161,13 +161,13 @@ Init Options:
'vault unseal' command, you will need to hex decode 'vault unseal' command, you will need to hex decode
and decrypt; this will be the plaintext unseal key. and decrypt; this will be the plaintext unseal key.
-recovery-key-shares=0 The number of key shares to split the recovery key -recovery-shares=0 The number of key shares to split the recovery key
into. This is not normally available. into. This is not normally available.
-recovery-key-threshold=0 The number of key shares required to reconstruct -recovery-threshold=0 The number of key shares required to reconstruct
the recovery key. This is not normally available. the recovery key. This is not normally available.
-recovery-key-pgp-keys If provided, behaves like "pgp-keys" but for the -recovery-pgp-keys If provided, behaves like "pgp-keys" but for the
recovery key shares. This is not normally available. recovery key shares. This is not normally available.
` `
return strings.TrimSpace(helpText) return strings.TrimSpace(helpText)