From 4f068c1638ba9022d7b3414e1cbc0921285adbb0 Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Wed, 22 Nov 2023 13:43:02 -0500 Subject: [PATCH 1/3] add loopback IP SAN to quickstart --- ziti/cmd/edge/quickstart.go | 1 + 1 file changed, 1 insertion(+) diff --git a/ziti/cmd/edge/quickstart.go b/ziti/cmd/edge/quickstart.go index 20084e7b9..f32ae153d 100644 --- a/ziti/cmd/edge/quickstart.go +++ b/ziti/cmd/edge/quickstart.go @@ -341,6 +341,7 @@ func (o *QuickstartOpts) createMinimalPki() { fmt.Sprintf("--server-name=%s", "server"), fmt.Sprintf("--server-file=%s", "server"), fmt.Sprintf("--dns=%s,%s", "localhost", helpers.GetCtrlAdvertisedAddress()), + "--ip=127.0.0.1", }) svrErr := svr.Execute() if svrErr != nil { From 95f884bae2d02b0e3747f05f7b640c04238816ed Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Wed, 22 Nov 2023 13:56:50 -0500 Subject: [PATCH 2/3] configure IP SAN with env var --- ziti/cmd/edge/quickstart.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ziti/cmd/edge/quickstart.go b/ziti/cmd/edge/quickstart.go index f32ae153d..7084db332 100644 --- a/ziti/cmd/edge/quickstart.go +++ b/ziti/cmd/edge/quickstart.go @@ -335,13 +335,18 @@ func (o *QuickstartOpts) createMinimalPki() { //ziti pki create server --pki-root="${ZITI_HOME}/pki" --ca-name "intermediate-ca" --server-name "server" --server-file "server" --dns "localhost,${ZITI_HOSTNAME}" svr := pki.NewCmdPKICreateServer(o.out, o.errOut) + var ips = "127.0.0.1" + ip_override := os.Getenv("ZITI_CTRL_EDGE_IP_OVERRIDE") + if ip_override != "" { + ips = ips + "," + ip_override + } svr.SetArgs([]string{ fmt.Sprintf("--pki-root=%s", where), fmt.Sprintf("--ca-name=%s", "intermediate-ca"), fmt.Sprintf("--server-name=%s", "server"), fmt.Sprintf("--server-file=%s", "server"), fmt.Sprintf("--dns=%s,%s", "localhost", helpers.GetCtrlAdvertisedAddress()), - "--ip=127.0.0.1", + fmt.Sprintf("--ip=%s", ips), }) svrErr := svr.Execute() if svrErr != nil { From ac2b1ab281414c56b65522bc3ea27a56399e10a2 Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Fri, 24 Nov 2023 15:12:51 -0500 Subject: [PATCH 3/3] add IPv6 loopback to default IP SANs --- ziti/cmd/edge/quickstart.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ziti/cmd/edge/quickstart.go b/ziti/cmd/edge/quickstart.go index 7084db332..b77b3bb91 100644 --- a/ziti/cmd/edge/quickstart.go +++ b/ziti/cmd/edge/quickstart.go @@ -335,7 +335,7 @@ func (o *QuickstartOpts) createMinimalPki() { //ziti pki create server --pki-root="${ZITI_HOME}/pki" --ca-name "intermediate-ca" --server-name "server" --server-file "server" --dns "localhost,${ZITI_HOSTNAME}" svr := pki.NewCmdPKICreateServer(o.out, o.errOut) - var ips = "127.0.0.1" + var ips = "127.0.0.1,::1" ip_override := os.Getenv("ZITI_CTRL_EDGE_IP_OVERRIDE") if ip_override != "" { ips = ips + "," + ip_override