Skip to content

Commit

Permalink
agent: Better warning for keyring with -encrypt option. Fixes #718.
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanuber committed Feb 20, 2015
1 parent be8b149 commit 4193525
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions command/agent/command.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}
}
Expand Down

0 comments on commit 4193525

Please sign in to comment.