From 7bfe5b6c9520daabb71d22f24470bc91eca931d9 Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Tue, 7 Jul 2020 08:10:37 -0600 Subject: [PATCH] httpcaddyfile: Reorder automation policy logic (close #3550) --- caddyconfig/httpcaddyfile/tlsapp.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/caddyconfig/httpcaddyfile/tlsapp.go b/caddyconfig/httpcaddyfile/tlsapp.go index 8f642915..029c024a 100644 --- a/caddyconfig/httpcaddyfile/tlsapp.go +++ b/caddyconfig/httpcaddyfile/tlsapp.go @@ -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