Upstream/pages-server
2
0
Fork 0
mirror of https://codeberg.org/Codeberg/pages-server.git synced 2024-06-09 12:40:53 +02:00
Code Issues Projects Releases Wiki Activity

revert changes

Browse Source
This commit is contained in:
crapStone 2024-05-02 20:41:19 +02:00 committed by crapStone
parent fa10cfae82
commit d980cd4e57
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server/certificates/certificates.go
View File

@ -185,13 +185,13 @@ func (c *AcmeClient) retrieveCertFromDB(sni, mainDomainSuffix string, useDnsProv
if err != nil {
return nil, err
}
tlsCertificate.Leaf, err = leaf(&tlsCertificate)
if err != nil {
return nil, err
}
// TODO: document & put into own function
if !strings.EqualFold(sni, mainDomainSuffix) {
tlsCertificate.Leaf, err = leaf(&tlsCertificate)
if err != nil {
return nil, err
}
// renew certificates 7 days before they expire
if tlsCertificate.Leaf.NotAfter.Before(time.Now().Add(7 * 24 * time.Hour)) {
// TODO: use ValidTill of custom cert struct
@ -229,10 +229,6 @@ func (c *AcmeClient) obtainCert(acmeClient *lego.Client, domains []string, renew
if err != nil {
return nil, fmt.Errorf("certificate failed in synchronous request: %w", err)
}
cert.Leaf, err = leaf(cert)
if err != nil {
return nil, err
}
return cert, nil
}
defer c.obtainLocks.Delete(name)
@ -320,10 +316,6 @@ func (c *AcmeClient) obtainCert(acmeClient *lego.Client, domains []string, renew
if err != nil {
return nil, err
}
tlsCertificate.Leaf, err = leaf(&tlsCertificate)
if err != nil {
return nil, err
}
return &tlsCertificate, nil
}