From e283d464d97c82887bb29b3cbc824d4bb2d46e49 Mon Sep 17 00:00:00 2001
From: gberl002 <geoff.berl@netfoundry.io>
Date: Tue, 17 May 2022 16:02:18 -0400
Subject: [PATCH] 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: