From 1d8bdd43847344d4ad5315c649f68b544a962444 Mon Sep 17 00:00:00 2001 From: SALLEYRON Julien Date: Fri, 28 Sep 2018 17:54:04 +0200 Subject: [PATCH] Don't remove static certs from config when cluster mode --- server/server.go | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/server/server.go b/server/server.go index d19462278..cacad7fca 100644 --- a/server/server.go +++ b/server/server.go @@ -480,18 +480,17 @@ func (s *Server) createTLSConfig(entryPointName string, tlsOption *traefiktls.TL } } else { config.GetCertificate = s.serverEntryPoints[entryPointName].getCertificate - } + if len(config.Certificates) != 0 { + certMap := s.buildNameOrIPToCertificate(config.Certificates) - if len(config.Certificates) != 0 { - certMap := s.buildNameOrIPToCertificate(config.Certificates) - - if s.entryPoints[entryPointName].CertificateStore != nil { - s.entryPoints[entryPointName].CertificateStore.StaticCerts.Set(certMap) + if s.entryPoints[entryPointName].CertificateStore != nil { + s.entryPoints[entryPointName].CertificateStore.StaticCerts.Set(certMap) + } } - } - // Remove certs from the TLS config object - config.Certificates = []tls.Certificate{} + // Remove certs from the TLS config object + config.Certificates = []tls.Certificate{} + } // Set the minimum TLS version if set in the config TOML if minConst, exists := traefiktls.MinVersion[s.entryPoints[entryPointName].Configuration.TLS.MinVersion]; exists {