From e26a198526cabdf4de48c325ce9eb411488eaaf9 Mon Sep 17 00:00:00 2001 From: Pierre Souchay Date: Tue, 14 Apr 2020 12:35:28 +0200 Subject: [PATCH 1/2] Fixed type in readme enbale by using the output of haproxy-consul-connect --help --- README.md | 61 +++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 48 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index ac02ab1..4158aeb 100644 --- a/README.md +++ b/README.md @@ -23,16 +23,51 @@ To handle intentions, HAProxy Connect, sets up a SPOE filter on the application ## How to use ``` -haproxy-connect \ - -sidecar-for \ - \ - -enable-intentions # wether or not to enbale intentions \ - - -haproxy-cfg-base-path # base path to store haproxy config in, \ - # will generate a unique directory per run under this, \ - # defaults to /tmp \ - - - -haproxy # no required if in your path \ - -dataplane # no required if in your path \ -``` \ No newline at end of file +./haproxy-consul-connect --help +Usage of ./haproxy-consul-connect: + -dataplane string + Dataplane binary path (default "dataplane-api") + -enable-intentions + Enable Connect intentions + -haproxy string + Haproxy binary path (default "haproxy") + -haproxy-cfg-base-path string + Haproxy binary path (default "/tmp") + -http-addr string + Consul agent address (default "127.0.0.1:8500") + -log-level string + Log level (default "INFO") + -sidecar-for string + The consul service id to proxy + -sidecar-for-tag string + The consul service id to proxy + -stats-addr string + Listen addr for stats server + -stats-service-register + Register a consul service for connect stats + -token string + Consul ACL token./haproxy-consul-connect --help +Usage of ./haproxy-consul-connect: + -dataplane string + Dataplane binary path (default "dataplane-api") + -enable-intentions + Enable Connect intentions + -haproxy string + Haproxy binary path (default "haproxy") + -haproxy-cfg-base-path string + Haproxy binary path (default "/tmp") + -http-addr string + Consul agent address (default "127.0.0.1:8500") + -log-level string + Log level (default "INFO") + -sidecar-for string + The consul service id to proxy + -sidecar-for-tag string + The consul service id to proxy + -stats-addr string + Listen addr for stats server + -stats-service-register + Register a consul service for connect stats + -token string + Consul ACL token +``` From fa1920914843d64f3930c0005a938318d3456c4b Mon Sep 17 00:00:00 2001 From: Andjelko Iharos Date: Wed, 15 Apr 2020 12:15:43 +0200 Subject: [PATCH 2/2] Update README.md --- README.md | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/README.md b/README.md index 4158aeb..256febb 100644 --- a/README.md +++ b/README.md @@ -47,27 +47,4 @@ Usage of ./haproxy-consul-connect: Register a consul service for connect stats -token string Consul ACL token./haproxy-consul-connect --help -Usage of ./haproxy-consul-connect: - -dataplane string - Dataplane binary path (default "dataplane-api") - -enable-intentions - Enable Connect intentions - -haproxy string - Haproxy binary path (default "haproxy") - -haproxy-cfg-base-path string - Haproxy binary path (default "/tmp") - -http-addr string - Consul agent address (default "127.0.0.1:8500") - -log-level string - Log level (default "INFO") - -sidecar-for string - The consul service id to proxy - -sidecar-for-tag string - The consul service id to proxy - -stats-addr string - Listen addr for stats server - -stats-service-register - Register a consul service for connect stats - -token string - Consul ACL token ```