From 6bb087cecd580ac6fcefbab18625b20bbf5d4c8e Mon Sep 17 00:00:00 2001 From: Paul Bellamy Date: Wed, 10 Jun 2015 09:56:17 +0100 Subject: [PATCH] [proxy] Renaming flags: `-H` -> `-D`, `-L` -> `-H` As per discussion in issue 875 --- prog/weaveproxy/main.go | 4 ++-- site/proxy.md | 8 ++++---- weave | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/prog/weaveproxy/main.go b/prog/weaveproxy/main.go index 1a5e30f4..4b8f039b 100644 --- a/prog/weaveproxy/main.go +++ b/prog/weaveproxy/main.go @@ -29,8 +29,8 @@ func main() { c.Version = version getopt.BoolVarLong(&debug, "debug", 'd', "log debugging information") getopt.BoolVarLong(&justVersion, "version", 0, "print version and exit") - getopt.StringVar(&c.ListenAddr, 'L', fmt.Sprintf("address on which to listen (default %s)", defaultListenAddr)) - getopt.StringVar(&c.DockerAddr, 'H', fmt.Sprintf("docker daemon URL to proxy (default %s)", defaultDockerAddr)) + getopt.StringVar(&c.ListenAddr, 'H', fmt.Sprintf("address on which to listen (default %s)", defaultListenAddr)) + getopt.StringVar(&c.DockerAddr, 'D', fmt.Sprintf("docker daemon URL to proxy (default %s)", defaultDockerAddr)) getopt.StringVarLong(&c.TLSConfig.CACert, "tlscacert", 0, "Trust certs signed only by this CA") getopt.StringVarLong(&c.TLSConfig.Cert, "tlscert", 0, "Path to TLS certificate file") getopt.BoolVarLong(&c.TLSConfig.Enabled, "tls", 0, "Use TLS; implied by --tlsverify") diff --git a/site/proxy.md b/site/proxy.md index 58030ad1..bfbe7eef 100644 --- a/site/proxy.md +++ b/site/proxy.md @@ -30,15 +30,15 @@ To start the proxy, run host1$ weave launch-proxy By default, the proxy will connect to docker at -`unix:///var/run/docker.sock`. This can be adjusted with the `-H` +`unix:///var/run/docker.sock`. This can be adjusted with the `-D` argument, e.g. - host1$ weave launch-proxy -H tcp://127.0.0.1:4243 + host1$ weave launch-proxy -D tcp://127.0.0.1:4243 By default, the proxy listens on port 12375, on all network -interfaces. This can be adjusted with the `-L` argument, e.g. +interfaces. This can be adjusted with the `-H` argument, e.g. - host1$ weave launch-proxy -L 127.0.0.1:9999 + host1$ weave launch-proxy -H tcp://127.0.0.1:9999 All docker commands can be run via the proxy, so it is safe to globally adjust your `DOCKER_HOST` to point at the proxy, e.g. diff --git a/weave b/weave index 96ef80fa..68603848 100755 --- a/weave +++ b/weave @@ -28,7 +28,7 @@ usage() { echo "weave launch [-password ] [-nickname ] [-nodiscovery]" echo " [-iprange ] ..." echo "weave launch-dns " - echo "weave launch-proxy [-H ] [-L
] [--with-dns] [--with-ipam]" + echo "weave launch-proxy [-D ] [-H
] [--with-dns] [--with-ipam]" echo "weave connect [--replace] [ ...]" echo "weave forget ..." echo "weave run [--with-dns] [ ...] ..."