From bc4c31e48ba667c576209f848ac33586f05f629b Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Tue, 15 Aug 2017 13:39:00 +0000 Subject: [PATCH 1/2] If DNS server is off then disable proxy DNS registration --- prog/weaver/main.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/prog/weaver/main.go b/prog/weaver/main.go index ab455cab..47d4889d 100644 --- a/prog/weaver/main.go +++ b/prog/weaver/main.go @@ -254,6 +254,9 @@ func main() { var proxy *weaveproxy.Proxy var err error if proxyConfig.Enabled { + if noDNS { + proxyConfig.WithoutDNS = true + } // Start Weave Proxy: proxy, err = weaveproxy.NewProxy(*proxyConfig) if err != nil { From 608b8f0a06430b38b6b1dad1f4a4fa01689ad17b Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Fri, 18 Aug 2017 13:13:18 +0000 Subject: [PATCH 2/2] Supply the weave port number to bridgeConfig --- prog/weaver/main.go | 1 + 1 file changed, 1 insertion(+) diff --git a/prog/weaver/main.go b/prog/weaver/main.go index 47d4889d..0bdb6c3a 100644 --- a/prog/weaver/main.go +++ b/prog/weaver/main.go @@ -285,6 +285,7 @@ func main() { name := peerName(routerName, bridgeConfig.WeaveBridgeName, dbPrefix, hostRoot) bridgeConfig.Mac = name.String() + bridgeConfig.Port = config.Port bridgeType, err := weavenet.EnsureBridge(procPath, &bridgeConfig, Log) checkFatal(err) Log.Println("Bridge type is", bridgeType)