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

rename client name more apropriate

Browse Source
This commit is contained in:
6543 2023-02-11 01:25:06 +01:00
parent 48198266fe
commit 258020749d
No known key found for this signature in database
GPG Key ID: B8BE6D610E61C862
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/certificates/acme_client.go
View File

@ -13,8 +13,8 @@ import (
) )
type AcmeClient struct { type AcmeClient struct {
legoClient *lego.Client legoClient *lego.Client
mainDomainLegoClient *lego.Client dnsChallengerLegoClient *lego.Client
obtainLocks sync.Map obtainLocks sync.Map
@ -72,8 +72,8 @@ func NewAcmeClient(acmeAccountConf, acmeAPI, acmeMail, acmeEabHmac, acmeEabKID,
} }
return &AcmeClient{ return &AcmeClient{
legoClient: acmeClient, legoClient: acmeClient,
mainDomainLegoClient: mainDomainAcmeClient, dnsChallengerLegoClient: mainDomainAcmeClient,
acmeUseRateLimits: acmeUseRateLimits, acmeUseRateLimits: acmeUseRateLimits,

4
server/certificates/certificates.go
View File

@ -300,7 +300,7 @@ func SetupMainDomainCertificates(mainDomainSuffix string, acmeClient *AcmeClient
} }
if mainCertBytes == nil { if mainCertBytes == nil {
_, err = acmeClient.obtainCert(acmeClient.mainDomainLegoClient, []string{"*" + mainDomainSuffix, mainDomainSuffix[1:]}, nil, "", true, mainDomainSuffix, certDB) _, err = acmeClient.obtainCert(acmeClient.dnsChallengerLegoClient, []string{"*" + mainDomainSuffix, mainDomainSuffix[1:]}, nil, "", true, mainDomainSuffix, certDB)
if err != nil { if err != nil {
log.Error().Err(err).Msg("Couldn't renew main domain certificate, continuing with mock certs only") log.Error().Err(err).Msg("Couldn't renew main domain certificate, continuing with mock certs only")
} }
@ -355,7 +355,7 @@ func MaintainCertDB(ctx context.Context, interval time.Duration, acmeClient *Acm
} else if tlsCertificates[0].NotAfter.Before(time.Now().Add(30 * 24 * time.Hour)) { } else if tlsCertificates[0].NotAfter.Before(time.Now().Add(30 * 24 * time.Hour)) {
// renew main certificate 30 days before it expires // renew main certificate 30 days before it expires
go (func() { go (func() {
_, err = acmeClient.obtainCert(acmeClient.mainDomainLegoClient, []string{"*" + mainDomainSuffix, mainDomainSuffix[1:]}, res, "", true, mainDomainSuffix, certDB) _, err = acmeClient.obtainCert(acmeClient.dnsChallengerLegoClient, []string{"*" + mainDomainSuffix, mainDomainSuffix[1:]}, res, "", true, mainDomainSuffix, certDB)
if err != nil { if err != nil {
log.Error().Err(err).Msg("Couldn't renew certificate for main domain") log.Error().Err(err).Msg("Couldn't renew certificate for main domain")
} }