diff --git a/site/weave-docker-api/using-proxy.md b/site/weave-docker-api/using-proxy.md index 3d578bb7..cbccc57e 100644 --- a/site/weave-docker-api/using-proxy.md +++ b/site/weave-docker-api/using-proxy.md @@ -53,6 +53,13 @@ By default, multicast traffic is routed over the Weave network. To turn this off, for example, because you want to configure your own multicast route, add the `--no-multicast-route` flag to `weave launch-proxy`. +###Other Weave Proxy options + + * `--without-dns` -- stop telling containers to use [WeaveDNS](/site/weavedns.md) + * `--log-level=debug|info|warning|error` -- controls how much + information to emit for debugging + * `--no-restart` -- remove the default policy of `--restart=always`, if + you want to control start-up of the proxy yourself **See Also** diff --git a/weave b/weave index 53ca7ec0..3662412f 100755 --- a/weave +++ b/weave @@ -41,17 +41,20 @@ weave --help | help weave launch launch-router [--password ] [--name ] [--nickname ] + [--log-level=debug|info|warning|error] [--no-restart] [--ipalloc-init ] [--ipalloc-range [--ipalloc-default-subnet ]] [--no-discovery] [--no-dns] [--trusted-subnets ,...] ... launch-proxy [-H ] [--without-dns] [--no-multicast-route] + [--log-level=debug|info|warning|error] [--no-rewrite-hosts] [--no-default-ipalloc] [--no-restart] [--hostname-from-label ] [--hostname-match ] [--hostname-replacement ] [--rewrite-inspect] launch-plugin [--no-restart] [--no-multicast-route] + [--log-level=debug|info|warning|error] weave prime