diff options
| author | Matthew Holt <mholt@users.noreply.github.com> | 2019-06-24 12:16:10 -0600 |
|---|---|---|
| committer | Matthew Holt <mholt@users.noreply.github.com> | 2019-06-24 12:16:10 -0600 |
| commit | 38677aaa58eb76a416fa42146956f3e3a5981e75 (patch) | |
| tree | a782a862b7e552d1bdaeebf3514b75392a06f4b4 /modules/caddytls/folderloader.go | |
| parent | d49f762f6d9cdc2e92e8de40f0b0e99a9d0c4fc9 (diff) | |
caddytls: Support tags for manually-loaded certificates
Diffstat (limited to 'modules/caddytls/folderloader.go')
| -rw-r--r-- | modules/caddytls/folderloader.go | 8 |
1 files changed, 5 insertions, 3 deletions
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) |