mirror of
https://github.com/optim-enterprises-bv/vault.git
synced 2025-10-29 09:42:25 +00:00
backport of commit 913481fb1f (#24222)
Co-authored-by: Scott Miller <smiller@hashicorp.com>
This commit is contained in:
committed by
GitHub
parent
638a194580
commit
b19d2a7f54
@@ -2570,10 +2570,16 @@ func setSeal(c *ServerCommand, config *server.Config, infoKeys []string, info ma
|
||||
Priority: 1,
|
||||
Name: "shamir",
|
||||
})
|
||||
case 1:
|
||||
// If there's only one seal and it's disabled assume they want to
|
||||
default:
|
||||
allSealsDisabled := true
|
||||
for _, c := range config.Seals {
|
||||
if !c.Disabled {
|
||||
allSealsDisabled = false
|
||||
}
|
||||
}
|
||||
// If all seals are disabled assume they want to
|
||||
// migrate to a shamir seal and simply didn't provide it
|
||||
if config.Seals[0].Disabled {
|
||||
if allSealsDisabled {
|
||||
config.Seals = append(config.Seals, &configutil.KMS{
|
||||
Type: vault.SealConfigTypeShamir.String(),
|
||||
Priority: 1,
|
||||
|
||||
Reference in New Issue
Block a user