Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS
Mirrored from https://github.com/Slazee/caddy.git
Synced Nov 14, 05:15 UTC
httpcaddyfile: Reorder automation policy logic (close #3550)
Matthew Holt committed
Jul 7, 2020 at 08:10 UTC
7bfe5b6c9520daabb71d22f24470bc91eca931d9
1 file changed
+3
-3
caddyconfig/httpcaddyfile/tlsapp.go
+3
-3
@@ -321,6 +321,9 @@ func (st ServerType) buildTLSApp(
321
322
// do a little verification & cleanup
323
if tlsApp.Automation != nil {
324
+ // consolidate automation policies that are the exact same
325
+ tlsApp.Automation.Policies = consolidateAutomationPolicies(tlsApp.Automation.Policies)
326
+
327
// ensure automation policies don't overlap subjects (this should be
328
// an error at provision-time as well, but catch it in the adapt phase
329
// for convenience)
@@ -333,9 +336,6 @@ func (st ServerType) buildTLSApp(
336
automationHostSet[s] = struct{}{}
337
}
338
}
336
-
337
- // consolidate automation policies that are the exact same
338
- tlsApp.Automation.Policies = consolidateAutomationPolicies(tlsApp.Automation.Policies)
339
}
340
341
return tlsApp, warnings, nil