gsadmin/ziti
1
0
Fork 0
mirror of https://github.com/openziti/ziti.git synced 2026-10-12 23:32:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing some bugs in config generation

Browse Source
This commit is contained in:
gberl002
2022-02-14 09:39:10 -05:00
parent 0c898e1adb
commit 078e2bf8a2
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ziti/cmd/ziti/cmd/config_templates/router.yml
+1 -1
View File
@@ -28,7 +28,7 @@ link:
listeners:
{{ if or .Router.IsFabric .Router.IsPrivate }}#{{- end }} - binding: transport
{{ if or .Router.IsFabric .Router.IsPrivate }}#{{- end }} address: tls:0.0.0.0:1{{ .Router.Edge.Port }}
{{ if or .Router.IsFabric .Router.IsPrivate }}#{{- end }} address: tls:0.0.0.0:{{ .Router.Edge.Port }}
{{ 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|tun|host
ziti/cmd/ziti/cmd/create_config.go
+4 -4
View File
@@ -60,8 +60,8 @@ type ControllerTemplateValues struct {
IdentityServerCert string
IdentityKey string
IdentityCA string
EdgeIdentityDuration string
EdgeRouterDuration string
EdgeIdentityDuration int
EdgeRouterDuration int
Edge EdgeControllerValues
WebListener ControllerWebListenerValues
HealthCheck ControllerHealthCheckValues
@@ -244,8 +244,8 @@ func (data *ConfigTemplateValues) populateDefaults() {
data.Router.Listener.ConnectTimeoutMs = constants.DefaultConnectTimeoutMs
data.Router.Listener.GetSessionTimeoutS = constants.DefaultGetSessionTimeoutS
data.Controller.Edge.APISessionTimeoutMinutes = constants.DefaultEdgeAPISessionTimeoutMinutes
data.Controller.EdgeIdentityDuration = string(rune(constants.DefaultEdgeIdentityDurationMinutes))
data.Controller.EdgeRouterDuration = string(rune(constants.DefaultEdgeRouterDurationMinutes))
data.Controller.EdgeIdentityDuration = constants.DefaultEdgeIdentityDurationMinutes
data.Controller.EdgeRouterDuration = constants.DefaultEdgeRouterDurationMinutes
data.Controller.WebListener.IdleTimeoutMS = constants.DefaultWebListenerIdleTimeoutMs
data.Controller.WebListener.ReadTimeoutMS = constants.DefaultWebListenerReadTimeoutMs
data.Controller.WebListener.WriteTimeoutMS = constants.DefaultWebListenerWriteTimeoutMs