Ver código fonte

Fix bound address/port for caddy's certmagic library (#15758) (#15848)

Backport #15758

* Fix bound address/port for caddy's certmagic library

* Fix bug

Co-authored-by: zeripath <art27@cantab.net>

Co-authored-by: Blake Miner <miner.blake@gmail.com>
tags/v1.14.3
zeripath 3 anos atrás
pai
commit
62daf84596
Nenhuma conta vinculada ao e-mail do autor do commit
1 arquivos alterados com 8 adições e 0 exclusões
  1. 8
    0
      cmd/web_letsencrypt.go

+ 8
- 0
cmd/web_letsencrypt.go Ver arquivo

@@ -6,6 +6,7 @@ package cmd

import (
"net/http"
"strconv"
"strings"

"code.gitea.io/gitea/modules/log"
@@ -22,6 +23,11 @@ func runLetsEncrypt(listenAddr, domain, directory, email string, m http.Handler)
// TODO: these are placeholders until we add options for each in settings with appropriate warning
enableHTTPChallenge := true
enableTLSALPNChallenge := true
altHTTPPort := 0

if p, err := strconv.Atoi(setting.PortToRedirect); err == nil {
altHTTPPort = p
}

magic := certmagic.NewDefault()
magic.Storage = &certmagic.FileStorage{Path: directory}
@@ -30,6 +36,8 @@ func runLetsEncrypt(listenAddr, domain, directory, email string, m http.Handler)
Agreed: setting.LetsEncryptTOS,
DisableHTTPChallenge: !enableHTTPChallenge,
DisableTLSALPNChallenge: !enableTLSALPNChallenge,
ListenHost: listenAddr,
AltHTTPPort: altHTTPPort,
})

magic.Issuer = myACME

Carregando…
Cancelar
Salvar