summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Holt <mholt@users.noreply.github.com>2020-07-07 08:10:37 -0600
committerMatthew Holt <mholt@users.noreply.github.com>2020-07-07 08:10:37 -0600
commit7bfe5b6c9520daabb71d22f24470bc91eca931d9 (patch)
tree94977a0c4d5e9fdd27e3250f4a0fc2a7732b294c
parent2a5599e2ad7f2d894915365782b3e4e1022c8e06 (diff)
httpcaddyfile: Reorder automation policy logic (close #3550)
-rw-r--r--caddyconfig/httpcaddyfile/tlsapp.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/caddyconfig/httpcaddyfile/tlsapp.go b/caddyconfig/httpcaddyfile/tlsapp.go
index 8f64291..029c024 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