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

Starting Træfik even if TLS certificates are in error

Browse source
This commit is contained in:
NicoMen 2018-02-22 14:38:04 +01:00 committed by Traefiker Bot
parent 83381e99cf
commit f460c1990e
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tls/certificate.go
View file

@ -95,7 +95,8 @@ func (c *Certificates) CreateTLSConfig(entryPointName string) (*tls.Config, map[
for _, certificate := range *c { for _, certificate := range *c {
err := certificate.AppendCertificates(domainsCertificates, entryPointName) err := certificate.AppendCertificates(domainsCertificates, entryPointName)
if err != nil { if err != nil {
return nil, nil, err log.Errorf("Unable to add a certificate to the entryPoint %q : %v", entryPointName, err)
continue
} }
for _, certDom := range domainsCertificates { for _, certDom := range domainsCertificates {
for _, cert := range certDom.Get().(map[string]*tls.Certificate) { for _, cert := range certDom.Get().(map[string]*tls.Certificate) {
@ -127,16 +128,16 @@ func (c *Certificate) AppendCertificates(certs map[string]*DomainsCertificates,
certContent, err := c.CertFile.Read() certContent, err := c.CertFile.Read()
if err != nil { if err != nil {
return err return fmt.Errorf("unable to read CertFile : %v", err)
} }
keyContent, err := c.KeyFile.Read() keyContent, err := c.KeyFile.Read()
if err != nil { if err != nil {
return err return fmt.Errorf("uUnable to read KeyFile : %v", err)
} }
tlsCert, err := tls.X509KeyPair(certContent, keyContent) tlsCert, err := tls.X509KeyPair(certContent, keyContent)
if err != nil { if err != nil {
return err return fmt.Errorf("unable to generate TLS certificate : %v", err)
} }
parsedCert, _ := x509.ParseCertificate(tlsCert.Certificate[0]) parsedCert, _ := x509.ParseCertificate(tlsCert.Certificate[0])