mirror of
				https://github.com/go-gitea/gitea
				synced 2025-10-31 03:18:24 +00:00 
			
		
		
		
	Fix bound address/port for caddy's certmagic library (#15758)
* Fix bound address/port for caddy's certmagic library * Fix bug Co-authored-by: zeripath <art27@cantab.net>
This commit is contained in:
		| @@ -6,6 +6,7 @@ package cmd | |||||||
|  |  | ||||||
| import ( | import ( | ||||||
| 	"net/http" | 	"net/http" | ||||||
|  | 	"strconv" | ||||||
| 	"strings" | 	"strings" | ||||||
|  |  | ||||||
| 	"code.gitea.io/gitea/modules/log" | 	"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 | 	// TODO: these are placeholders until we add options for each in settings with appropriate warning | ||||||
| 	enableHTTPChallenge := true | 	enableHTTPChallenge := true | ||||||
| 	enableTLSALPNChallenge := true | 	enableTLSALPNChallenge := true | ||||||
|  | 	altHTTPPort := 0 | ||||||
|  |  | ||||||
|  | 	if p, err := strconv.Atoi(setting.PortToRedirect); err == nil { | ||||||
|  | 		altHTTPPort = p | ||||||
|  | 	} | ||||||
|  |  | ||||||
| 	magic := certmagic.NewDefault() | 	magic := certmagic.NewDefault() | ||||||
| 	magic.Storage = &certmagic.FileStorage{Path: directory} | 	magic.Storage = &certmagic.FileStorage{Path: directory} | ||||||
| @@ -30,6 +36,8 @@ func runLetsEncrypt(listenAddr, domain, directory, email string, m http.Handler) | |||||||
| 		Agreed:                  setting.LetsEncryptTOS, | 		Agreed:                  setting.LetsEncryptTOS, | ||||||
| 		DisableHTTPChallenge:    !enableHTTPChallenge, | 		DisableHTTPChallenge:    !enableHTTPChallenge, | ||||||
| 		DisableTLSALPNChallenge: !enableTLSALPNChallenge, | 		DisableTLSALPNChallenge: !enableTLSALPNChallenge, | ||||||
|  | 		ListenHost:              listenAddr, | ||||||
|  | 		AltHTTPPort:             altHTTPPort, | ||||||
| 	}) | 	}) | ||||||
|  |  | ||||||
| 	magic.Issuers = []certmagic.Issuer{myACME} | 	magic.Issuers = []certmagic.Issuer{myACME} | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user