homelab/traefik
1
0
Fork 0
Code Activity

Merge branch 'v1.5' into master

Browse source
This commit is contained in:
Fernandez Ludovic 2018-01-24 11:57:06 +01:00
commit c8446c2dc8
40 changed files with 493 additions and 234 deletions
Download patch file Download diff file Expand all files Collapse all files

30
autogen/gentemplates/gen.go
View file

@ -791,9 +791,9 @@ var _templatesKubernetesTmpl = []byte(`[backends]{{range $backendName, $backend
{{if $frontend.Redirect}}
[frontends."{{$frontendName}}".redirect]
entryPoint = "{{$frontend.RedirectEntryPoint}}"
regex = "{{$frontend.RedirectRegex}}"
replacement = "{{$frontend.RedirectReplacement}}"
entryPoint = "{{$frontend.Redirect.EntryPoint}}"
regex = "{{$frontend.Redirect.Regex}}"
replacement = "{{$frontend.Redirect.Replacement}}"
{{end}}
{{if $frontend.Headers }}
@ -848,14 +848,14 @@ var _templatesKubernetesTmpl = []byte(`[backends]{{range $backendName, $backend
{{end}}
{{end}}
{{range $tlsConfiguration := .TLSConfiguration}}
[[tlsConfiguration]]
entryPoints = [{{range $tlsConfiguration.EntryPoints}}
{{range $tls := .TLS}}
[[tls]]
entryPoints = [{{range $tls.EntryPoints}}
"{{.}}",
{{end}}]
[tlsConfiguration.certificate]
certFile = """{{$tlsConfiguration.Certificate.CertFile}}"""
keyFile = """{{$tlsConfiguration.Certificate.KeyFile}}"""
[tls.certificate]
certFile = """{{$tls.Certificate.CertFile}}"""
keyFile = """{{$tls.Certificate.KeyFile}}"""
{{end}}
`)
@ -1037,16 +1037,16 @@ var _templatesKvTmpl = []byte(`[backends]
{{end}}
{{range $tlsConfiguration := getTLSConfigurations .Prefix }}
[[tlsConfiguration]]
{{range $tls := getTLSSection .Prefix }}
[[tls]]
entryPoints = [{{range $tlsConfiguration.EntryPoints }}
entryPoints = [{{range $tls.EntryPoints }}
"{{.}}",
{{end}}]
[tlsConfiguration.certificate]
certFile = """{{ $tlsConfiguration.Certificate.CertFile }}"""
keyFile = """{{ $tlsConfiguration.Certificate.KeyFile }}"""
[tls.certificate]
certFile = """{{ $tls.Certificate.CertFile }}"""
keyFile = """{{ $tls.Certificate.KeyFile }}"""
{{end}}
`)