caddytls: Fixes regarding internal-named domains, issuer configs

Should address #7147
This commit is contained in:
Matthew Holt 2025-10-29 15:42:33 -06:00 committed by Francis Lavoie
parent 895b56063a
commit c3a41434e4
3 changed files with 19 additions and 13 deletions

View file

@ -404,8 +404,12 @@ func (ap *AutomationPolicy) isWildcardOrDefault() bool {
// DefaultIssuers returns empty Issuers (not provisioned) to be used as defaults.
// This function is experimental and has no compatibility promises.
func DefaultIssuers(userEmail string) []certmagic.Issuer {
issuers := []certmagic.Issuer{new(ACMEIssuer)}
if strings.TrimSpace(userEmail) != "" {
issuers := []certmagic.Issuer{
&ACMEIssuer{
Email: userEmail,
},
}
if strings.TrimSpace(userEmail) != "" { // ZeroSSL requires an email address
issuers = append(issuers, &ACMEIssuer{
CA: certmagic.ZeroSSLProductionCA,
Email: userEmail,