rv/traefik
1
0
Fork 0
forked from SW/traefik
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'v1.5' into master

Browse Source
This commit is contained in:
Fernandez Ludovic
2018-01-24 11:57:06 +01:00
parent fb4ba7af2b 4afb39778a
commit c8446c2dc8
40 changed files with 493 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tls/tls.go
View File

@@ -93,8 +93,8 @@ func (r *RootCAs) Type() string {
return "rootcas"
}
// SortTLSConfigurationPerEntryPoints converts TLS configuration sorted by Certificates into TLS configuration sorted by EntryPoints
func SortTLSConfigurationPerEntryPoints(configurations []*Configuration, epConfiguration map[string]*DomainsCertificates, defaultEntryPoints []string) error {
// SortTLSPerEntryPoints converts TLS configuration sorted by Certificates into TLS configuration sorted by EntryPoints
func SortTLSPerEntryPoints(configurations []*Configuration, epConfiguration map[string]*DomainsCertificates, defaultEntryPoints []string) error {
if epConfiguration == nil {
epConfiguration = make(map[string]*DomainsCertificates)
}