From e283d464d97c82887bb29b3cbc824d4bb2d46e49 Mon Sep 17 00:00:00 2001 From: gberl002 Date: Tue, 17 May 2022 16:02:18 -0400 Subject: [PATCH 1/3] Uncommenting edge config for private routers --- ziti/cmd/ziti/cmd/config_templates/router.yml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ziti/cmd/ziti/cmd/config_templates/router.yml b/ziti/cmd/ziti/cmd/config_templates/router.yml index 7edeeca39..df096e2ab 100644 --- a/ziti/cmd/ziti/cmd/config_templates/router.yml +++ b/ziti/cmd/ziti/cmd/config_templates/router.yml @@ -25,17 +25,17 @@ link: {{ if .Router.IsPrivate }}#{{ end }} options: {{ if .Router.IsPrivate }}#{{ end }} outQueueSize: {{ .Router.Listener.OutQueueSize }} -{{ if or .Router.IsFabric .Router.IsPrivate }}#{{ end }}listeners: +{{ if .Router.IsFabric .Router.IsPrivate }}#{{ end }}listeners: # bindings of edge and tunnel requires an "edge" section below -{{ if or .Router.IsFabric .Router.IsPrivate }}#{{ end }} - binding: edge -{{ if or .Router.IsFabric .Router.IsPrivate }}#{{ end }} address: {{ if .Router.IsWss }}ws{{ else }}tls{{end}}:0.0.0.0:{{ .Router.Edge.Port }} -{{ if or .Router.IsFabric .Router.IsPrivate }}#{{ end }} options: -{{ if or .Router.IsFabric .Router.IsPrivate }}#{{ end }} advertise: {{ .Router.Edge.Hostname }}:{{ if .Router.IsWss }}3023{{ else }}{{ .Router.Edge.Port }}{{ end }} -{{ if or .Router.IsFabric .Router.IsPrivate }}#{{ end }} connectTimeoutMs: {{ .Router.Listener.ConnectTimeout.Milliseconds }} -{{ if or .Router.IsFabric .Router.IsPrivate }}#{{ end }} getSessionTimeout: {{ .Router.Listener.GetSessionTimeout.Seconds }}s -{{ if or .Router.IsFabric .Router.IsPrivate }}#{{ end }} - binding: tunnel -{{ if or .Router.IsFabric .Router.IsPrivate }}#{{ end }} options: -{{ if or .Router.IsFabric .Router.IsPrivate }}#{{ end }} mode: host #tproxy|host +{{ if .Router.IsFabric }}#{{ end }} - binding: edge +{{ if .Router.IsFabric }}#{{ end }} address: {{ if .Router.IsWss }}ws{{ else }}tls{{end}}:0.0.0.0:{{ .Router.Edge.Port }} +{{ if .Router.IsFabric }}#{{ end }} options: +{{ if .Router.IsFabric }}#{{ end }} advertise: {{ .Router.Edge.Hostname }}:{{ if .Router.IsWss }}3023{{ else }}{{ .Router.Edge.Port }}{{ end }} +{{ if .Router.IsFabric }}#{{ end }} connectTimeoutMs: {{ .Router.Listener.ConnectTimeout.Milliseconds }} +{{ if .Router.IsFabric }}#{{ end }} getSessionTimeout: {{ .Router.Listener.GetSessionTimeout.Seconds }}s +{{ if .Router.IsFabric }}#{{ end }} - binding: tunnel +{{ if .Router.IsFabric }}#{{ end }} options: +{{ if .Router.IsFabric }}#{{ end }} mode: host #tproxy|host {{ if or .Router.IsFabric .Router.IsPrivate }} csr: From 4f01e92eadadbbce057ea4c0dd80bdfc12d7fda1 Mon Sep 17 00:00:00 2001 From: gberl002 Date: Wed, 18 May 2022 09:40:11 -0400 Subject: [PATCH 2/3] Removing unnecessary check from template --- ziti/cmd/ziti/cmd/config_templates/router.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ziti/cmd/ziti/cmd/config_templates/router.yml b/ziti/cmd/ziti/cmd/config_templates/router.yml index df096e2ab..775a1b468 100644 --- a/ziti/cmd/ziti/cmd/config_templates/router.yml +++ b/ziti/cmd/ziti/cmd/config_templates/router.yml @@ -25,7 +25,7 @@ link: {{ if .Router.IsPrivate }}#{{ end }} options: {{ if .Router.IsPrivate }}#{{ end }} outQueueSize: {{ .Router.Listener.OutQueueSize }} -{{ if .Router.IsFabric .Router.IsPrivate }}#{{ end }}listeners: +{{ if .Router.IsFabric }}#{{ end }}listeners: # bindings of edge and tunnel requires an "edge" section below {{ if .Router.IsFabric }}#{{ end }} - binding: edge {{ if .Router.IsFabric }}#{{ end }} address: {{ if .Router.IsWss }}ws{{ else }}tls{{end}}:0.0.0.0:{{ .Router.Edge.Port }} From 305af371bcfcb1f119cedf0119f69935f857c326 Mon Sep 17 00:00:00 2001 From: gberl002 Date: Wed, 18 May 2022 09:47:31 -0400 Subject: [PATCH 3/3] Adding "edge" config for private router config files --- ziti/cmd/ziti/cmd/config_templates/router.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ziti/cmd/ziti/cmd/config_templates/router.yml b/ziti/cmd/ziti/cmd/config_templates/router.yml index 775a1b468..4676eb883 100644 --- a/ziti/cmd/ziti/cmd/config_templates/router.yml +++ b/ziti/cmd/ziti/cmd/config_templates/router.yml @@ -37,7 +37,7 @@ link: {{ if .Router.IsFabric }}#{{ end }} options: {{ if .Router.IsFabric }}#{{ end }} mode: host #tproxy|host -{{ if or .Router.IsFabric .Router.IsPrivate }} +{{ if or .Router.IsFabric }} csr: country: US province: NC