mirrors/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-05-05 12:26:34 +02:00
Code Issues Projects Releases Wiki Activity

Update the plugin directory logic

Browse Source
This commit is contained in:
Brian Kassouf 2017-04-13 11:22:53 -07:00
parent b20c17745c
commit 07f3f4fc26
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
command/server.go
View File

@ -284,6 +284,13 @@ func (c *ServerCommand) Run(args []string) int {
return 1
}
coreConfig.PluginDirectory = filepath.Join(homePath, "/.vault-plugins/")
err = os.Mkdir(coreConfig.PluginDirectory, 0700)
if err != nil && !os.IsExist(err) {
c.Ui.Output(fmt.Sprintf(
"Error making default plugin directory: %v", err))
return 1
}
}
var disableClustering bool

5
command/server/config.go
View File

@ -273,6 +273,11 @@ func (c *Config) Merge(c2 *Config) *Config {
result.EnableUI = c2.EnableUI
}
result.PluginDirectory = c.PluginDirectory
if c2.PluginDirectory != "" {
result.PluginDirectory = c2.PluginDirectory
}
return result
}