mirror of
https://github.com/caddyserver/caddy.git
synced 2026-11-17 13:29:35 +00:00
* httpcaddyfile: Don't merge automation policies if it would shadow another
Signed-off-by: Bartlomiej Wisniowski <56162793+bwisn@users.noreply.github.com>
* httpcaddyfile: add reverse case for shadowing merge, use force_automate to match the real life usage and explain why we're not checking the inverse
Signed-off-by: Bartlomiej Wisniowski <56162793+bwisn@users.noreply.github.com>
* httpcaddyfile: Check overlap in both directions when merging policies
Signed-off-by: Bartlomiej Wisniowski <56162793+bwisn@users.noreply.github.com>
---------
Signed-off-by: Bartlomiej Wisniowski <56162793+bwisn@users.noreply.github.com>
(cherry picked from commit
|
||
|---|---|---|
| .. | ||
| integration | ||
| a.caddy.localhost.crt | ||
| a.caddy.localhost.key | ||
| caddy.ca.cer | ||
| caddy.localhost.crt | ||
| caddy.localhost.key | ||
| caddytest.go | ||
| caddytest_test.go | ||
| leafcert.pem | ||