ResiLien
/
wesher
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

be more explicit about --bind-addr

This commit is contained in:
Leo Antunes 2019-03-27 00:47:23 +01:00
parent a8b310bc76
commit abb832d159
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -83,7 +83,7 @@ All options can be passed either as command-line flags or environment variables:
|---|---|---|---|
| --cluster-key | WESHER_CLUSTER_KEY | shared key for cluster membership; must be 32 bytes base64 encoded; will be generated if not provided | |
| --join | WESHER_JOIN | comma separated list of hostnames or IP addresses to existing cluster members; if not provided, will attempt resuming any known state or otherwise wait for further members | |
| --bind-addr | WESHER_BIND_ADDR | IP address to bind to for cluster membership | `0.0.0.0` |
| --bind-addr | WESHER_BIND_ADDR | IP address to bind to for cluster membership | automatic |
| --cluster-port | WESHER_CLUSTER_PORT | port used for membership gossip traffic (both TCP and UDP); must be the same across cluster | `7946` |
| --wireguard-port | WESHER_WIREGUARD_PORT | port used for wireguard traffic (UDP); must be the same across cluster | `51820` |
| --overlay-net | WESHER_OVERLAY_NET | the network in which to allocate addresses for the overlay mesh network (CIDR format); smaller networks increase the chance of IP collision | `10.0.0.0/8` |

10
config.go
View File

@ -14,7 +14,7 @@ const clusterKeyLen = 32
type config struct {
ClusterKey []byte `id:"cluster-key" desc:"shared key for cluster membership; must be 32 bytes base64 encoded; will be generated if not provided"`
Join []string `desc:"comma separated list of hostnames or IP addresses to existing cluster members; if not provided, will attempt resuming any known state or otherwise wait for further members."`
BindAddr string `id:"bind-addr" desc:"IP address to bind to for cluster membership" default:"0.0.0.0"`
BindAddr string `id:"bind-addr" desc:"IP address to bind to for cluster membership"`
ClusterPort int `id:"cluster-port" desc:"port used for membership gossip traffic (both TCP and UDP); must be the same across cluster" default:"7946"`
WireguardPort int `id:"wireguard-port" desc:"port used for wireguard traffic (UDP); must be the same across cluster" default:"51820"`
OverlayNet *network `id:"overlay-net" desc:"the network in which to allocate addresses for the overlay mesh network (CIDR format); smaller networks increase the chance of IP collision" default:"10.0.0.0/8"`
@ -44,14 +44,14 @@ func loadConfig() (*config, error) {
}
// FIXME: this is a work around for memberlist refusing to listen on public IPs
if config.BindAddr == "0.0.0.0" {
forceBindAddr, err := sockaddr.GetPublicIP()
if config.BindAddr == "" {
detectedBindAddr, err := sockaddr.GetPublicIP()
if err != nil {
return nil, err
}
// if we cannot find a public IP, let memberlist do its thing
if forceBindAddr != "" {
config.BindAddr = forceBindAddr
if detectedBindAddr != "" {
config.BindAddr = detectedBindAddr
}
}