status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-01-13 07:14:37 +00:00
Code Issues Projects Releases Wiki Activity

agent: Better warning for keyring with -encrypt option. Fixes .

Browse Source
This commit is contained in:
Ryan Uber 2015-02-19 18:51:32 -08:00
parent be8b14979e
commit 4193525931
1 changed files with 2 additions and 2 deletions

4
command/agent/command.go

@ -162,12 +162,12 @@ func (c *Command) readConfig() *Config {
}
keyfileLAN := filepath.Join(config.DataDir, serfLANKeyring)
if _, err := os.Stat(keyfileLAN); err == nil {
c.Ui.Error("WARNING: LAN keyring exists but -encrypt given, ignoring")
c.Ui.Error("WARNING: LAN keyring exists but -encrypt given, using keyring")
}
if config.Server {
keyfileWAN := filepath.Join(config.DataDir, serfWANKeyring)
if _, err := os.Stat(keyfileWAN); err == nil {
c.Ui.Error("WARNING: WAN keyring exists but -encrypt given, ignoring")
c.Ui.Error("WARNING: WAN keyring exists but -encrypt given, using keyring")
}
}
}