scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-02 03:27:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

config for autoloading license (oss parts)

Browse Source
This commit is contained in:
Nick Cabatoff
2021-05-07 08:55:41 -04:00
committed by GitHub
parent 0ca21c638a
commit 55ce931730
7 changed files with 42 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
command/server.go
View File

@@ -1121,6 +1121,13 @@ func (c *ServerCommand) Run(args []string) int {
}
}
if envLicensePath := os.Getenv("VAULT_LICENSE_PATH"); envLicensePath != "" {
config.LicensePath = envLicensePath
}
if envLicense := os.Getenv("VAULT_LICENSE"); envLicense != "" {
config.License = envLicense
}
// If mlockall(2) isn't supported, show a warning. We disable this in dev
// because it is quite scary to see when first using Vault. We also disable
// this if the user has explicitly disabled mlock in configuration.
@@ -1318,6 +1325,8 @@ func (c *ServerCommand) Run(args []string) int {
SecureRandomReader: secureRandomReader,
EnableResponseHeaderHostname: config.EnableResponseHeaderHostname,
EnableResponseHeaderRaftNodeID: config.EnableResponseHeaderRaftNodeID,
License: config.License,
LicensePath: config.LicensePath,
}
if c.flagDev {
coreConfig.EnableRaw = true