From 9263d3e82c7bfc4a04e5cbf16de723ed6fb75a55 Mon Sep 17 00:00:00 2001 From: Adam Harrison Date: Wed, 18 Nov 2015 10:24:46 +0000 Subject: [PATCH 1/2] Fix erroneously hyphenated Docker TLS arguments --- site/proxy.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/site/proxy.md b/site/proxy.md index acf3a379..c34fbe30 100644 --- a/site/proxy.md +++ b/site/proxy.md @@ -237,8 +237,8 @@ supplied to the docker daemon. For example, if you have generated your certificates and keys into the docker host's `/tls` directory, we can launch the proxy with: - host1$ weave launch-proxy --tls-verify --tls-cacert=/tls/ca.pem \ - --tls-cert=/tls/server-cert.pem --tls-key=/tls/server-key.pem + host1$ weave launch-proxy --tlsverify --tlscacert=/tls/ca.pem \ + --tlscert=/tls/server-cert.pem --tlskey=/tls/server-key.pem The paths to your certificates and key must be provided as absolute paths which exist on the docker host. @@ -254,8 +254,8 @@ for an example. With the proxy running over TLS, we can configure our regular docker client to use TLS on a per-invocation basis with - $ docker --tls-verify --tls-cacert=ca.pem --tls-cert=cert.pem \ - --tls-key=key.pem -H=tcp://host1:12375 version + $ docker --tlsverify --tlscacert=ca.pem --tlscert=cert.pem \ + --tlskey=key.pem -H=tcp://host1:12375 version ... or, From 385b0aa07f93bce6f42a2982214346ae8213b531 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Fri, 20 Nov 2015 10:33:20 +0000 Subject: [PATCH 2/2] Fix typo in -tls info string --- prog/weaveproxy/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prog/weaveproxy/main.go b/prog/weaveproxy/main.go index a0a247df..b166d5b3 100644 --- a/prog/weaveproxy/main.go +++ b/prog/weaveproxy/main.go @@ -35,7 +35,7 @@ func main() { mflag.BoolVar(&c.NoRewriteHosts, []string{"-no-rewrite-hosts"}, false, "do not automatically rewrite /etc/hosts. Use if you need the docker IP to remain in /etc/hosts") mflag.StringVar(&c.TLSConfig.CACert, []string{"#tlscacert", "-tlscacert"}, "", "Trust certs signed only by this CA") mflag.StringVar(&c.TLSConfig.Cert, []string{"#tlscert", "-tlscert"}, "", "Path to TLS certificate file") - mflag.BoolVar(&c.TLSConfig.Enabled, []string{"#tls", "-tls"}, false, "Use TLS; implied by --tls-verify") + mflag.BoolVar(&c.TLSConfig.Enabled, []string{"#tls", "-tls"}, false, "Use TLS; implied by --tlsverify") mflag.StringVar(&c.TLSConfig.Key, []string{"#tlskey", "-tlskey"}, "", "Path to TLS key file") mflag.BoolVar(&c.TLSConfig.Verify, []string{"#tlsverify", "-tlsverify"}, false, "Use TLS and verify the remote") mflag.BoolVar(&c.WithDNS, []string{"-with-dns", "w"}, false, "instruct created containers to always use weaveDNS as their nameserver")