From 5c508c5d131a03cc9d63d7203b8e89294c3d4e28 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Thu, 2 Jun 2022 15:57:51 +0200
Subject: [PATCH] create giteaClient once
---
cmd/main.go | 3 ++-
server/certificates/certificates.go | 5 +++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/cmd/main.go b/cmd/main.go
index 9662048..257b724 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -109,7 +109,8 @@ func Serve(ctx *cli.Context) error {
defer certDB.Close() //nolint:errcheck // database has no close ... sync behave like it
listener = tls.NewListener(listener, certificates.TLSConfig(mainDomainSuffix,
- giteaRoot, giteaAPIToken, dnsProvider,
+ giteaClient,
+ dnsProvider,
acmeUseRateLimits,
keyCache, challengeCache, dnsLookupCache, canonicalDomainCache,
certDB))
diff --git a/server/certificates/certificates.go b/server/certificates/certificates.go
index 1d2fdbb..2684dfa 100644
--- a/server/certificates/certificates.go
+++ b/server/certificates/certificates.go
@@ -38,7 +38,8 @@ import (
// TLSConfig returns the configuration for generating, serving and cleaning up Let's Encrypt certificates.
func TLSConfig(mainDomainSuffix []byte,
- giteaRoot, giteaAPIToken, dnsProvider string,
+ giteaClient *gitea.Client,
+ dnsProvider string,
acmeUseRateLimits bool,
keyCache, challengeCache, dnsLookupCache, canonicalDomainCache cache.SetGetKey,
certDB database.CertDB,
@@ -82,7 +83,7 @@ func TLSConfig(mainDomainSuffix []byte,
sni = string(sniBytes)
} else {
_, _ = targetRepo, targetBranch
- _, valid := upstream.CheckCanonicalDomain(gitea.NewClient(giteaRoot, giteaAPIToken), targetOwner, targetRepo, targetBranch, sni, string(mainDomainSuffix), canonicalDomainCache)
+ _, valid := upstream.CheckCanonicalDomain(giteaClient, targetOwner, targetRepo, targetBranch, sni, string(mainDomainSuffix), canonicalDomainCache)
if !valid {
sniBytes = mainDomainSuffix
sni = string(sniBytes)