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

Missed a few similar spots for alt_server_certs formatting

Browse Source 
Signed-off-by: gberl002 <geoff.berl@netfoundry.io>
This commit is contained in:
gberl002
2023-08-10 10:03:44 -04:00
parent 595e365b16
commit f55c1b41d9
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ziti/cmd/config_templates/controller.yml
+6 -6
View File
@@ -14,9 +14,9 @@ identity:
server_cert: "{{ .Controller.Identity.ServerCert }}"
key: "{{ .Controller.Identity.Key }}"
ca: "{{ .Controller.Identity.Ca }}"
{{ .Controller.Web.Identity.AltCertsEnabled }}alt_server_certs:
{{ .Controller.Web.Identity.AltCertsEnabled }} - server_cert: "{{ .Controller.Web.Identity.AltServerCert }}"
{{ .Controller.Web.Identity.AltCertsEnabled }} server_key: "{{ .Controller.Web.Identity.AltServerKey }}"
{{ if not .Controller.Web.Identity.AltCertsEnabled }}#{{ end }}alt_server_certs:
{{ if not .Controller.Web.Identity.AltCertsEnabled }}#{{ end }} - server_cert: "{{ .Controller.Web.Identity.AltServerCert }}"
{{ if not .Controller.Web.Identity.AltCertsEnabled }}#{{ end }} server_key: "{{ .Controller.Web.Identity.AltServerKey }}"
# Network Configuration
#
@@ -168,9 +168,9 @@ web:
key: "{{ .Controller.Web.Identity.Key }}"
server_cert: "{{ .Controller.Web.Identity.ServerCert }}"
cert: "{{ .Controller.Web.Identity.Cert }}"
{{ .Controller.Web.Identity.AltCertsEnabled }}alt_server_certs:
{{ .Controller.Web.Identity.AltCertsEnabled }}- server_cert: "{{ .Controller.Web.Identity.AltServerCert }}"
{{ .Controller.Web.Identity.AltCertsEnabled }} server_key: "{{ .Controller.Web.Identity.AltServerKey }}"
{{ if not .Controller.Web.Identity.AltCertsEnabled }}#{{ end }}alt_server_certs:
{{ if not .Controller.Web.Identity.AltCertsEnabled }}#{{ end }}- server_cert: "{{ .Controller.Web.Identity.AltServerCert }}"
{{ if not .Controller.Web.Identity.AltCertsEnabled }}#{{ end }} server_key: "{{ .Controller.Web.Identity.AltServerKey }}"
# options - optional
# Allows the specification of webListener level options - mainly dealing with HTTP/TLS settings. These options are
ziti/cmd/config_templates/router.yml
+6 -6
View File
@@ -12,9 +12,9 @@ identity:
server_cert: "{{ .Router.IdentityServerCert }}"
key: "{{ .Router.IdentityKey }}"
ca: "{{ .Router.IdentityCA }}"
{{ if not .Router.AltCertsEnabled }}#{{ end }}alt_server_certs:
{{ if not .Router.AltCertsEnabled }}#{{ end }} - server_cert: "{{ .Router.AltServerCert }}"
{{ if not .Router.AltCertsEnabled }}#{{ end }} server_key: "{{ .Router.AltServerKey }}"
{{ if not .Router.AltCertsEnabled }}#{{ end }}alt_server_certs:
{{ if not .Router.AltCertsEnabled }}#{{ end }} - server_cert: "{{ .Router.AltServerCert }}"
{{ if not .Router.AltCertsEnabled }}#{{ end }} server_key: "{{ .Router.AltServerKey }}"
ctrl:
endpoint: tls:{{ .Controller.Ctrl.AdvertisedAddress }}:{{ .Controller.Ctrl.AdvertisedPort }}
@@ -87,9 +87,9 @@ edge:
{{ if not .Router.IsWss }}#{{ end }} enableCompression: {{ .Router.Wss.EnableCompression }}
{{ if not .Router.IsWss }}#{{ end }} server_cert: {{ .Router.IdentityServerCert }}
{{ if not .Router.IsWss }}#{{ end }} key: {{ .Router.IdentityKey }}
{{ .Router.AltCertsEnabled }}alt_server_certs:
{{ .Router.AltCertsEnabled }} - server_cert: "{{ .Router.AltServerCert }}"
{{ .Router.AltCertsEnabled }} server_key: "{{ .Router.AltServerKey }}"
{{ if not .Router.AltCertsEnabled }}#{{ end }}alt_server_certs:
{{ if not .Router.AltCertsEnabled }}#{{ end }} - server_cert: "{{ .Router.AltServerCert }}"
{{ if not .Router.AltCertsEnabled }}#{{ end }} server_key: "{{ .Router.AltServerKey }}"
forwarder:
latencyProbeInterval: {{ .Router.Forwarder.LatencyProbeInterval.Seconds }}
xgressDialQueueLength: {{ .Router.Forwarder.XgressDialQueueLength }}