mokhtar/local-ip.sh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix certificate renewal renewing only the wildcard cert

Browse Source
This commit is contained in:
m5r 2024-10-27 23:14:34 +01:00
parent cd2ed76903
commit 349f6a05a2
Signed by: mokhtar
GPG Key ID: 1509B54946D08A95
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
certs/certs.go
View File

@ -42,15 +42,15 @@ func (c *certsClient) requestCertificate(certType string) {
utils.Logger.Info().Str("certType", certType).Msg("Requesting certificate") utils.Logger.Info().Str("certType", certType).Msg("Requesting certificate")
if lastCertificate != nil { if lastCertificate != nil {
certificates, err := certcrypto.ParsePEMBundle(c.lastWildcardCertificate.Certificate) certificates, err := certcrypto.ParsePEMBundle(lastCertificate.Certificate)
if err != nil { if err != nil {
utils.Logger.Fatal().Err(err).Msg("Failed to parse PEM bundle from last certificate") utils.Logger.Fatal().Str("certType", certType).Err(err).Msg("Failed to parse PEM bundle from last certificate")
} }
x509Cert := certificates[0] x509Cert := certificates[0]
timeLeft := x509Cert.NotAfter.Sub(time.Now().UTC()) timeLeft := x509Cert.NotAfter.Sub(time.Now().UTC())
if timeLeft > time.Hour*24*30 { if timeLeft > time.Hour*24*30 {
utils.Logger.Info().Msgf("%d days left before expiration, skip renewal", int(timeLeft.Hours()/24)) utils.Logger.Info().Str("certType", certType).Msgf("%d days left before expiration, skip renewal", int(timeLeft.Hours()/24))
return return
} }
@ -89,7 +89,6 @@ func (c *certsClient) renewCertificates() {
} }
c.lastRootCertificate = rootCertificate c.lastRootCertificate = rootCertificate
persistFiles(rootCertificate, "root") persistFiles(rootCertificate, "root")
} }
func persistFiles(certificates *certificate.Resource, certType string) { func persistFiles(certificates *certificate.Resource, certType string) {