Port some changes back to OSS (#8359)

command/server/config.go

@@ -25,6 +25,8 @@ const (
 
 // Config is the configuration for the vault server.
 type Config struct {
+	entConfig
+
 	Listeners []*Listener `hcl:"-"`
 	Storage   *Storage    `hcl:"-"`
 	HAStorage *Storage    `hcl:"-"`
@@ -641,6 +643,11 @@ func ParseConfig(d string) (*Config, error) {
 		}
 	}
 
+	entConfig := &(result.entConfig)
+	if err := entConfig.parseConfig(list); err != nil {
+		return nil, errwrap.Wrapf("error parsing enterprise config: {{err}}", err)
+	}
+
 	return &result, nil
 }