From c21167e3a2dc481750ce541d65782297e8c47254 Mon Sep 17 00:00:00 2001 From: zeripath Date: Sat, 15 May 2021 18:28:14 +0100 Subject: [PATCH] Fix bound address/port for caddy's certmagic library (see #15848) (#15859) (#15878) Co-authored-by: Blake Miner Co-authored-by: 6543 <6543@obermui.de> --- cmd/web_letsencrypt.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cmd/web_letsencrypt.go b/cmd/web_letsencrypt.go index 6c48d3e854..4d4d54419d 100644 --- a/cmd/web_letsencrypt.go +++ b/cmd/web_letsencrypt.go @@ -24,10 +24,14 @@ func runLetsEncrypt(listenAddr, domain, directory, email string, m http.Handler) enableHTTPChallenge := true enableTLSALPNChallenge := true altHTTPPort := 0 + altTLSALPNPort := 0 if p, err := strconv.Atoi(setting.PortToRedirect); err == nil { altHTTPPort = p } + if p, err := strconv.Atoi(setting.HTTPPort); err == nil { + altTLSALPNPort = p + } magic := certmagic.NewDefault() magic.Storage = &certmagic.FileStorage{Path: directory} @@ -36,7 +40,8 @@ func runLetsEncrypt(listenAddr, domain, directory, email string, m http.Handler) Agreed: setting.LetsEncryptTOS, DisableHTTPChallenge: !enableHTTPChallenge, DisableTLSALPNChallenge: !enableTLSALPNChallenge, - ListenHost: listenAddr, + ListenHost: setting.HTTPAddr, + AltTLSALPNPort: altTLSALPNPort, AltHTTPPort: altHTTPPort, }) -- 2.39.5