summaryrefslogtreecommitdiff
path: root/caddytest/integration
diff options
context:
space:
mode:
authorMatthew Holt <mholt@users.noreply.github.com>2021-05-11 15:26:07 -0600
committerMatthew Holt <mholt@users.noreply.github.com>2021-05-11 15:26:07 -0600
commitdbe164d98a58e8b0dbf3fed26e4e9bb6f668a9e2 (patch)
tree16252c8c08a262e824741daf9a837f847646b9fa /caddytest/integration
parentbc2210247861340c644d9825ac2b2860f8c6e12a (diff)
httpcaddyfile: Fix automation policy consolidation again (fix #4161)
Also fix a previous test that asserted incorrect behavior.
Diffstat (limited to 'caddytest/integration')
-rw-r--r--caddytest/integration/caddyfile_adapt/tls_automation_policies_4.txt12
-rw-r--r--caddytest/integration/caddyfile_adapt/tls_automation_policies_6.txt120
2 files changed, 120 insertions, 12 deletions
diff --git a/caddytest/integration/caddyfile_adapt/tls_automation_policies_4.txt b/caddytest/integration/caddyfile_adapt/tls_automation_policies_4.txt
index 502dbd0..d8f2164 100644
--- a/caddytest/integration/caddyfile_adapt/tls_automation_policies_4.txt
+++ b/caddytest/integration/caddyfile_adapt/tls_automation_policies_4.txt
@@ -135,18 +135,6 @@ abc.de {
"module": "zerossl"
}
]
- },
- {
- "issuers": [
- {
- "email": "my.email@example.com",
- "module": "acme"
- },
- {
- "email": "my.email@example.com",
- "module": "zerossl"
- }
- ]
}
]
}
diff --git a/caddytest/integration/caddyfile_adapt/tls_automation_policies_6.txt b/caddytest/integration/caddyfile_adapt/tls_automation_policies_6.txt
new file mode 100644
index 0000000..b3ad7ff
--- /dev/null
+++ b/caddytest/integration/caddyfile_adapt/tls_automation_policies_6.txt
@@ -0,0 +1,120 @@
+# (this Caddyfile is contrived, but based on issue #4161)
+
+example.com {
+ tls {
+ ca https://foobar
+ }
+}
+
+example.com:8443 {
+ tls {
+ ca https://foobar
+ }
+}
+
+example.com:8444 {
+ tls {
+ ca https://foobar
+ }
+}
+
+example.com:8445 {
+ tls {
+ ca https://foobar
+ }
+}
+
+----------
+{
+ "apps": {
+ "http": {
+ "servers": {
+ "srv0": {
+ "listen": [
+ ":443"
+ ],
+ "routes": [
+ {
+ "match": [
+ {
+ "host": [
+ "example.com"
+ ]
+ }
+ ],
+ "terminal": true
+ }
+ ]
+ },
+ "srv1": {
+ "listen": [
+ ":8443"
+ ],
+ "routes": [
+ {
+ "match": [
+ {
+ "host": [
+ "example.com"
+ ]
+ }
+ ],
+ "terminal": true
+ }
+ ]
+ },
+ "srv2": {
+ "listen": [
+ ":8444"
+ ],
+ "routes": [
+ {
+ "match": [
+ {
+ "host": [
+ "example.com"
+ ]
+ }
+ ],
+ "terminal": true
+ }
+ ]
+ },
+ "srv3": {
+ "listen": [
+ ":8445"
+ ],
+ "routes": [
+ {
+ "match": [
+ {
+ "host": [
+ "example.com"
+ ]
+ }
+ ],
+ "terminal": true
+ }
+ ]
+ }
+ }
+ },
+ "tls": {
+ "automation": {
+ "policies": [
+ {
+ "subjects": [
+ "example.com"
+ ],
+ "issuers": [
+ {
+ "ca": "https://foobar",
+ "module": "acme"
+ }
+ ]
+ }
+ ]
+ }
+ }
+ }
+} \ No newline at end of file