From 35c998f402b9b3be263af25a26cbfcde74d911f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=97=E5=AD=90?= <i@haozi.net>
Date: Mon, 4 Mar 2024 18:34:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=AD=BE=E5=8F=91=E8=AF=81=E4=B9=A6?=
 =?UTF-8?q?=E4=B8=8D=E5=BC=BA=E5=88=B6=20OCSP=20=E8=A3=85=E8=AE=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/services/container.go | 8 ++++----
 pkg/acme/client.go             | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/internal/services/container.go b/internal/services/container.go
index 0adf142e..17b21a60 100644
--- a/internal/services/container.go
+++ b/internal/services/container.go
@@ -17,11 +17,11 @@ type Container struct {
 	client *client.Client
 }
 
-func NewContainer(sock string) *Container {
-	if sock == "" {
-		sock = "/run/podman/podman.sock"
+func NewContainer(sock ...string) *Container {
+	if len(sock) == 0 {
+		sock[0] = "/run/podman/podman.sock"
 	}
-	cli, _ := client.NewClientWithOpts(client.WithHost("unix://"+sock), client.WithAPIVersionNegotiation())
+	cli, _ := client.NewClientWithOpts(client.WithHost("unix://"+sock[0]), client.WithAPIVersionNegotiation())
 	return &Container{
 		client: cli,
 	}
diff --git a/pkg/acme/client.go b/pkg/acme/client.go
index adf3646b..f4f8d197 100644
--- a/pkg/acme/client.go
+++ b/pkg/acme/client.go
@@ -103,8 +103,9 @@ func (c *Client) UseHTTP(path string) error {
 // ObtainSSL 签发 SSL 证书
 func (c *Client) ObtainSSL(domains []string) (certificate.Resource, error) {
 	request := certificate.ObtainRequest{
-		Domains: domains,
-		Bundle:  true,
+		Domains:    domains,
+		Bundle:     true,
+		MustStaple: false,
 	}
 
 	certificates, err := c.Client.Certificate.Obtain(request)
@@ -124,7 +125,7 @@ func (c *Client) RenewSSL(certUrl string) (certificate.Resource, error) {
 
 	certificates, err = c.Client.Certificate.RenewWithOptions(*certificates, &certificate.RenewOptions{
 		Bundle:     true,
-		MustStaple: true,
+		MustStaple: false,
 	})
 	if err != nil {
 		return certificate.Resource{}, err