From 38677aaa58eb76a416fa42146956f3e3a5981e75 Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Mon, 24 Jun 2019 12:16:10 -0600 Subject: caddytls: Support tags for manually-loaded certificates --- modules/caddytls/folderloader.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'modules/caddytls/folderloader.go') diff --git a/modules/caddytls/folderloader.go b/modules/caddytls/folderloader.go index bcc22d8..c491708 100644 --- a/modules/caddytls/folderloader.go +++ b/modules/caddytls/folderloader.go @@ -29,8 +29,8 @@ type folderLoader []string // listed in fl from all files ending with .pem. This method of loading // certificates expects the certificate and key to be bundled into the // same file. -func (fl folderLoader) LoadCertificates() ([]tls.Certificate, error) { - var certs []tls.Certificate +func (fl folderLoader) LoadCertificates() ([]Certificate, error) { + var certs []Certificate for _, dir := range fl { err := filepath.Walk(dir, func(fpath string, info os.FileInfo, err error) error { if err != nil { @@ -48,7 +48,7 @@ func (fl folderLoader) LoadCertificates() ([]tls.Certificate, error) { return err } - certs = append(certs, cert) + certs = append(certs, Certificate{Certificate: cert}) return nil }) @@ -120,3 +120,5 @@ func x509CertFromCertAndKeyPEMFile(fpath string) (tls.Certificate, error) { return cert, nil } + +var _ CertificateLoader = (folderLoader)(nil) -- cgit v1.2.3