caddypki: Prefer user-configured root instead of generating new one (#5189)

instead of generating a new root certificate at the default location
load the certificate from the configuration.
fixes: #5181
This commit is contained in:
Jonathan Garcia authored and GitHub committed 2022-11-08 12:13:46 -07:00
1 parent 6efd1b3bb1
commit 33fdea8f26
1 file changed
+3
+3
View File
@@ -240,6 +240,9 @@ func (ca *CA) NewAuthority(authorityConfig AuthorityConfig) (*authority.Authorit
}
func (ca CA) loadOrGenRoot() (rootCert *x509.Certificate, rootKey any, err error) {
if ca.Root != nil {
return ca.Root.Load()
}
rootCertPEM, err := ca.storage.Load(ca.ctx, ca.storageKeyRootCert())
if err != nil {
if !errors.Is(err, fs.ErrNotExist) {