From 919944ddaea5a7561e14adb0819bce7764005c2e Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Fri, 2 Oct 2015 21:15:21 +0100
Subject: [PATCH] make 'no Docker API access' the default in the exe

...and instead enable it in the script, via the (better named) option.
---
 prog/weaver/main.go | 8 ++++----
 weave               | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/prog/weaver/main.go b/prog/weaver/main.go
index f690dcc868..b778b34983 100644
--- a/prog/weaver/main.go
+++ b/prog/weaver/main.go
@@ -51,7 +51,7 @@ func main() {
 		iprangeCIDR               string
 		ipsubnetCIDR              string
 		peerCount                 int
-		apiPath                   string
+		dockerAPI                 string
 		peers                     []string
 		noDNS                     bool
 		dnsDomain                 string
@@ -79,7 +79,7 @@ func main() {
 	mflag.StringVar(&iprangeCIDR, []string{"#iprange", "#-iprange", "-ipalloc-range"}, "", "IP address range reserved for automatic allocation, in CIDR notation")
 	mflag.StringVar(&ipsubnetCIDR, []string{"#ipsubnet", "#-ipsubnet", "-ipalloc-default-subnet"}, "", "subnet to allocate within by default, in CIDR notation")
 	mflag.IntVar(&peerCount, []string{"#initpeercount", "#-initpeercount", "-init-peer-count"}, 0, "number of peers in network (for IP address allocation)")
-	mflag.StringVar(&apiPath, []string{"#api", "-api"}, "unix:///var/run/docker.sock", "path to Docker API socket; set to '' to disable")
+	mflag.StringVar(&dockerAPI, []string{"#api", "#-api", "-docker-api"}, "", "Docker API endpoint, e.g. unix:///var/run/docker.sock")
 	mflag.BoolVar(&noDNS, []string{"-no-dns"}, false, "disable DNS server")
 	mflag.StringVar(&dnsDomain, []string{"-dns-domain"}, nameserver.DefaultDomain, "local domain to server requests for")
 	mflag.StringVar(&dnsListenAddress, []string{"-dns-listen-address"}, nameserver.DefaultListenAddress, "address to listen on for DNS requests")
@@ -176,8 +176,8 @@ func main() {
 	Log.Println("Our name is", router.Ourself)
 
 	var dockerCli *docker.Client
-	if apiPath != "" {
-		dc, err := docker.NewClient(apiPath)
+	if dockerAPI != "" {
+		dc, err := docker.NewClient(dockerAPI)
 		if err != nil {
 			Log.Fatal("Unable to start docker client: ", err)
 		}
diff --git a/weave b/weave
index f116765d31..77f9738753 100755
--- a/weave
+++ b/weave
@@ -1171,7 +1171,7 @@ launch_router() {
         -v /var/run/docker.sock:/var/run/docker.sock \
         -e WEAVE_PASSWORD \
         -e WEAVE_CIDR=none \
-        $WEAVE_DOCKER_ARGS $IMAGE $COVERAGE_ARGS --iface $CONTAINER_IFNAME --port $CONTAINER_PORT --name "$PEERNAME" --nickname "$(hostname)" --ipalloc-range "$IPRANGE" --dns-effective-listen-address "$DOCKER_BRIDGE_IP" "$@")
+        $WEAVE_DOCKER_ARGS $IMAGE $COVERAGE_ARGS --iface $CONTAINER_IFNAME --port $CONTAINER_PORT --name "$PEERNAME" --nickname "$(hostname)" --ipalloc-range "$IPRANGE" --dns-effective-listen-address "$DOCKER_BRIDGE_IP" --docker-api "unix:///var/run/docker.sock" "$@")
     with_container_netns_or_die $ROUTER_CONTAINER launch
     err_msg=$(death_msg $CONTAINER_NAME)
     container_ip $CONTAINER_NAME "$err_msg" "$err_msg" || return 1