OrgGo
/
caddy
mirror of https://github.com/caddyserver/caddy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

httpcaddyfile: Reorder automation policy logic (close #3550)

This commit is contained in:
Matthew Holt 2020-07-07 08:10:37 -06:00
parent 2a5599e2ad
commit 7bfe5b6c95
No known key found for this signature in database
GPG Key ID: 2A349DD577D586A5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
caddyconfig/httpcaddyfile/tlsapp.go
View File

@ -321,6 +321,9 @@ func (st ServerType) buildTLSApp(
// do a little verification & cleanup
if tlsApp.Automation != nil {
// consolidate automation policies that are the exact same
tlsApp.Automation.Policies = consolidateAutomationPolicies(tlsApp.Automation.Policies)
// ensure automation policies don't overlap subjects (this should be
// an error at provision-time as well, but catch it in the adapt phase
// for convenience)
@ -333,9 +336,6 @@ func (st ServerType) buildTLSApp(
automationHostSet[s] = struct{}{}
}
}
// consolidate automation policies that are the exact same
tlsApp.Automation.Policies = consolidateAutomationPolicies(tlsApp.Automation.Policies)
}
return tlsApp, warnings, nil