baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

TLS, ACME, cluster and several entrypoints.

Browse source
This commit is contained in:
Ludovic Fernandez 2018-10-01 16:56:03 +02:00 committed by Traefiker Bot
parent 9e26f0b058
commit 147e79ea07
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
server/server.go
View file

@ -462,8 +462,7 @@ func (s *Server) createTLSConfig(entryPointName string, tlsOption *traefiktls.TL
} }
} }
if s.globalConfiguration.ACME != nil { if s.globalConfiguration.ACME != nil && entryPointName == s.globalConfiguration.ACME.EntryPoint {
if entryPointName == s.globalConfiguration.ACME.EntryPoint {
checkOnDemandDomain := func(domain string) bool { checkOnDemandDomain := func(domain string) bool {
routeMatch := &mux.RouteMatch{} routeMatch := &mux.RouteMatch{}
match := router.GetHandler().Match(&http.Request{URL: &url.URL{}, Host: domain}, routeMatch) match := router.GetHandler().Match(&http.Request{URL: &url.URL{}, Host: domain}, routeMatch)
@ -477,7 +476,6 @@ func (s *Server) createTLSConfig(entryPointName string, tlsOption *traefiktls.TL
if err != nil { if err != nil {
return nil, err return nil, err
} }
}
} else { } else {
config.GetCertificate = s.serverEntryPoints[entryPointName].getCertificate config.GetCertificate = s.serverEntryPoints[entryPointName].getCertificate
if len(config.Certificates) != 0 { if len(config.Certificates) != 0 {