httpcaddyfile: Skip automate loader if disable_certs is specified (fix #6148)

mholt · mholt · commit 3efda6fb3a06 · 2024-04-17T12:26:03.000-06:00
diff --git a/caddyconfig/httpcaddyfile/tlsapp.go b/caddyconfig/httpcaddyfile/tlsapp.go
@@ -344,7 +344,7 @@ func (st ServerType) buildTLSApp(
 	internalAP := &caddytls.AutomationPolicy{
 		IssuersRaw: []json.RawMessage{json.RawMessage(`{"module":"internal"}`)},
 	}
-	if autoHTTPS != "off" {
+	if autoHTTPS != "off" && autoHTTPS != "disable_certs" {
 		for h := range httpsHostsSharedWithHostlessKey {
 			al = append(al, h)
 			if !certmagic.SubjectQualifiesForPublicCert(h) {

Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,7 @@ func (st ServerType) buildTLSApp(`
`344`	`344`	`internalAP := &caddytls.AutomationPolicy{`
`345`	`345`	IssuersRaw: []json.RawMessage{json.RawMessage(`{"module":"internal"}`)},
`346`	`346`	`}`
`347`		`- if autoHTTPS != "off" {`
	`347`	`+ if autoHTTPS != "off" && autoHTTPS != "disable_certs" {`
`348`	`348`	`for h := range httpsHostsSharedWithHostlessKey {`
`349`	`349`	`al = append(al, h)`
`350`	`350`	`if !certmagic.SubjectQualifiesForPublicCert(h) {`