Certificate can contain path or file contents

Signed-off-by: Martin <martin.piegay@zenika.com>
This commit is contained in:
Martin 2016-06-27 12:19:14 +02:00
parent 056e0fe2d9
commit 7ada80b619
5 changed files with 172 additions and 14 deletions

View file

@ -290,14 +290,9 @@ func (server *Server) createTLSConfig(entryPointName string, tlsOption *TLS, rou
return nil, nil
}
config := &tls.Config{}
config.Certificates = []tls.Certificate{}
for _, v := range tlsOption.Certificates {
cert, err := tls.LoadX509KeyPair(v.CertFile, v.KeyFile)
if err != nil {
return nil, err
}
config.Certificates = append(config.Certificates, cert)
config, err := tlsOption.Certificates.CreateTLSConfig()
if err != nil {
return nil, err
}
if len(tlsOption.ClientCAFiles) > 0 {