diff options
| author | zeripath <art27@cantab.net> | 2021-05-15 18:28:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-15 18:28:14 +0100 |
| commit | c21167e3a2dc481750ce541d65782297e8c47254 (patch) | |
| tree | bb66e921931c0f768a38496f5982a13ffc4649aa /cmd/web_letsencrypt.go | |
| parent | aaa539dd2dd08fd92462e6e115a07f716d63f7ca (diff) | |
| download | gitea-c21167e3a2dc481750ce541d65782297e8c47254.tar.gz gitea-c21167e3a2dc481750ce541d65782297e8c47254.zip | |
Fix bound address/port for caddy's certmagic library (see #15848) (#15859) (#15878)
Co-authored-by: Blake Miner <miner.blake@gmail.com>
Co-authored-by: 6543 <6543@obermui.de>
Diffstat (limited to 'cmd/web_letsencrypt.go')
| -rw-r--r-- | cmd/web_letsencrypt.go | 7 |
1 files changed, 6 insertions, 1 deletions
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, }) |