github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-06-19 21:41:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

caddytls: Prefer managed wildcard certs over individual subdomain certs (#6959)

Browse Source 
* caddytls: Prefer managed wildcard certs over individual subdomain certs

* Repurpose force_automate as no_wildcard

* Fix a couple bugs

* Restore force_automate and use automate loader as wildcard override
This commit is contained in:
Matt Holt
2025-04-18 11:44:23 -06:00
committed by GitHub
parent 35c8c2d92d
commit 1bfa111552
13 changed files with 173 additions and 492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
logging.go
View File

@ -20,6 +20,7 @@ import (
"io"
"log"
"os"
"slices"
"strings"
"sync"
"time"
@ -490,10 +491,8 @@ func (cl *CustomLog) provision(ctx Context, logging *Logging) error {
if len(cl.Include) > 0 && len(cl.Exclude) > 0 {
// prevent intersections
for _, allow := range cl.Include {
for _, deny := range cl.Exclude {
if allow == deny {
return fmt.Errorf("include and exclude must not intersect, but found %s in both lists", allow)
}
if slices.Contains(cl.Exclude, allow) {
return fmt.Errorf("include and exclude must not intersect, but found %s in both lists", allow)
}
}