summaryrefslogtreecommitdiff
path: root/caddytest/integration/caddyfile_adapt
diff options
context:
space:
mode:
Diffstat (limited to 'caddytest/integration/caddyfile_adapt')
-rw-r--r--caddytest/integration/caddyfile_adapt/global_options_acme.txt2
-rw-r--r--caddytest/integration/caddyfile_adapt/global_server_options_multi.txt9
-rw-r--r--caddytest/integration/caddyfile_adapt/global_server_options_single.txt2
-rw-r--r--caddytest/integration/caddyfile_adapt/header.txt2
-rw-r--r--caddytest/integration/caddyfile_adapt/http_only_on_domain.txt7
-rw-r--r--caddytest/integration/caddyfile_adapt/matchers_in_route.txt12
-rw-r--r--caddytest/integration/caddyfile_adapt/php_fastcgi_subdirectives.txt16
-rw-r--r--caddytest/integration/caddyfile_adapt/request_body.txt3
-rw-r--r--caddytest/integration/caddyfile_adapt/reverse_proxy_empty_non_http_transport.txt2
-rw-r--r--caddytest/integration/caddyfile_adapt/reverse_proxy_h2c_shorthand.txt74
-rw-r--r--caddytest/integration/caddyfile_adapt/tls_automation_policies_2.txt8
-rw-r--r--caddytest/integration/caddyfile_adapt/tls_client_auth_cert_file.txt2
-rw-r--r--caddytest/integration/caddyfile_adapt/tls_client_auth_inline_cert.txt4
-rw-r--r--caddytest/integration/caddyfile_adapt/tls_conn_policy_consolidate.txt7
14 files changed, 65 insertions, 85 deletions
diff --git a/caddytest/integration/caddyfile_adapt/global_options_acme.txt b/caddytest/integration/caddyfile_adapt/global_options_acme.txt
index 0f1d78f..fb95588 100644
--- a/caddytest/integration/caddyfile_adapt/global_options_acme.txt
+++ b/caddytest/integration/caddyfile_adapt/global_options_acme.txt
@@ -9,7 +9,7 @@
}
acme_ca https://example.com
acme_eab {
- key_id 4K2scIVbBpNd-78scadB2g
+ key_id 4K2scIVbBpNd-78scadB2g
mac_key abcdefghijklmnopqrstuvwx-abcdefghijklnopqrstuvwxyz12ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefgh
}
acme_ca_root /path/to/ca.crt
diff --git a/caddytest/integration/caddyfile_adapt/global_server_options_multi.txt b/caddytest/integration/caddyfile_adapt/global_server_options_multi.txt
index 653eee5..90c02e5 100644
--- a/caddytest/integration/caddyfile_adapt/global_server_options_multi.txt
+++ b/caddytest/integration/caddyfile_adapt/global_server_options_multi.txt
@@ -16,7 +16,7 @@
}
}
-foo.com {
+foo.com {
}
http://bar.com {
@@ -64,12 +64,7 @@ http://bar.com {
],
"terminal": true
}
- ],
- "automatic_https": {
- "skip": [
- "bar.com"
- ]
- }
+ ]
},
"srv2": {
"listen": [
diff --git a/caddytest/integration/caddyfile_adapt/global_server_options_single.txt b/caddytest/integration/caddyfile_adapt/global_server_options_single.txt
index 5a5c64c..d81d032 100644
--- a/caddytest/integration/caddyfile_adapt/global_server_options_single.txt
+++ b/caddytest/integration/caddyfile_adapt/global_server_options_single.txt
@@ -18,7 +18,7 @@
}
}
-foo.com {
+foo.com {
}
----------
diff --git a/caddytest/integration/caddyfile_adapt/header.txt b/caddytest/integration/caddyfile_adapt/header.txt
index 19a5b41..223839e 100644
--- a/caddytest/integration/caddyfile_adapt/header.txt
+++ b/caddytest/integration/caddyfile_adapt/header.txt
@@ -4,7 +4,7 @@
header ?John "von Neumann"
header -Wolfram
header {
- Grace: "Hopper" # some users habitually suffix field names with a colon
+ Grace: "Hopper" # some users habitually suffix field names with a colon
+Ray "Solomonoff"
?Tim "Berners-Lee"
defer
diff --git a/caddytest/integration/caddyfile_adapt/http_only_on_domain.txt b/caddytest/integration/caddyfile_adapt/http_only_on_domain.txt
index 83e7759..d279242 100644
--- a/caddytest/integration/caddyfile_adapt/http_only_on_domain.txt
+++ b/caddytest/integration/caddyfile_adapt/http_only_on_domain.txt
@@ -46,12 +46,7 @@ http://a.caddy.localhost {
],
"terminal": true
}
- ],
- "automatic_https": {
- "skip": [
- "a.caddy.localhost"
- ]
- }
+ ]
}
}
}
diff --git a/caddytest/integration/caddyfile_adapt/matchers_in_route.txt b/caddytest/integration/caddyfile_adapt/matchers_in_route.txt
index 01609b0..8c587b5 100644
--- a/caddytest/integration/caddyfile_adapt/matchers_in_route.txt
+++ b/caddytest/integration/caddyfile_adapt/matchers_in_route.txt
@@ -1,10 +1,10 @@
:80 {
- route {
- # unused matchers should not panic
- # see https://github.com/caddyserver/caddy/issues/3745
- @matcher1 path /path1
- @matcher2 path /path2
- }
+ route {
+ # unused matchers should not panic
+ # see https://github.com/caddyserver/caddy/issues/3745
+ @matcher1 path /path1
+ @matcher2 path /path2
+ }
}
----------
{
diff --git a/caddytest/integration/caddyfile_adapt/php_fastcgi_subdirectives.txt b/caddytest/integration/caddyfile_adapt/php_fastcgi_subdirectives.txt
index 6733a9e..90d1633 100644
--- a/caddytest/integration/caddyfile_adapt/php_fastcgi_subdirectives.txt
+++ b/caddytest/integration/caddyfile_adapt/php_fastcgi_subdirectives.txt
@@ -1,15 +1,15 @@
:8884
php_fastcgi localhost:9000 {
- # some php_fastcgi-specific subdirectives
- split .php .php5
- env VAR1 value1
- env VAR2 value2
- root /var/www
- index index.php5
+ # some php_fastcgi-specific subdirectives
+ split .php .php5
+ env VAR1 value1
+ env VAR2 value2
+ root /var/www
+ index index.php5
- # passed through to reverse_proxy (directive order doesn't matter!)
- lb_policy random
+ # passed through to reverse_proxy (directive order doesn't matter!)
+ lb_policy random
}
----------
{
diff --git a/caddytest/integration/caddyfile_adapt/request_body.txt b/caddytest/integration/caddyfile_adapt/request_body.txt
index 458b739..1e4fd47 100644
--- a/caddytest/integration/caddyfile_adapt/request_body.txt
+++ b/caddytest/integration/caddyfile_adapt/request_body.txt
@@ -1,6 +1,7 @@
localhost
+
request_body {
- max_size 1MB
+ max_size 1MB
}
----------
{
diff --git a/caddytest/integration/caddyfile_adapt/reverse_proxy_empty_non_http_transport.txt b/caddytest/integration/caddyfile_adapt/reverse_proxy_empty_non_http_transport.txt
index b261803..bcbe29b 100644
--- a/caddytest/integration/caddyfile_adapt/reverse_proxy_empty_non_http_transport.txt
+++ b/caddytest/integration/caddyfile_adapt/reverse_proxy_empty_non_http_transport.txt
@@ -1,7 +1,7 @@
:8884
reverse_proxy 127.0.0.1:65535 {
- transport fastcgi
+ transport fastcgi
}
----------
{
diff --git a/caddytest/integration/caddyfile_adapt/reverse_proxy_h2c_shorthand.txt b/caddytest/integration/caddyfile_adapt/reverse_proxy_h2c_shorthand.txt
index 94f2208..75ce960 100644
--- a/caddytest/integration/caddyfile_adapt/reverse_proxy_h2c_shorthand.txt
+++ b/caddytest/integration/caddyfile_adapt/reverse_proxy_h2c_shorthand.txt
@@ -1,38 +1,38 @@
-:8884
-
-reverse_proxy h2c://localhost:8080
-----------
-{
- "apps": {
- "http": {
- "servers": {
- "srv0": {
- "listen": [
- ":8884"
- ],
- "routes": [
- {
- "handle": [
- {
- "handler": "reverse_proxy",
- "transport": {
- "protocol": "http",
- "versions": [
- "h2c",
- "2"
- ]
- },
- "upstreams": [
- {
- "dial": "localhost:8080"
- }
- ]
- }
- ]
- }
- ]
- }
- }
- }
- }
+:8884
+
+reverse_proxy h2c://localhost:8080
+----------
+{
+ "apps": {
+ "http": {
+ "servers": {
+ "srv0": {
+ "listen": [
+ ":8884"
+ ],
+ "routes": [
+ {
+ "handle": [
+ {
+ "handler": "reverse_proxy",
+ "transport": {
+ "protocol": "http",
+ "versions": [
+ "h2c",
+ "2"
+ ]
+ },
+ "upstreams": [
+ {
+ "dial": "localhost:8080"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ }
+ }
+ }
+ }
} \ No newline at end of file
diff --git a/caddytest/integration/caddyfile_adapt/tls_automation_policies_2.txt b/caddytest/integration/caddyfile_adapt/tls_automation_policies_2.txt
index 9be0a19..17196ec 100644
--- a/caddytest/integration/caddyfile_adapt/tls_automation_policies_2.txt
+++ b/caddytest/integration/caddyfile_adapt/tls_automation_policies_2.txt
@@ -1,5 +1,4 @@
# issue #3953
-
{
cert_issuer zerossl api_key
}
@@ -58,12 +57,7 @@ http://example.net {
],
"terminal": true
}
- ],
- "automatic_https": {
- "skip": [
- "example.net"
- ]
- }
+ ]
}
}
},
diff --git a/caddytest/integration/caddyfile_adapt/tls_client_auth_cert_file.txt b/caddytest/integration/caddyfile_adapt/tls_client_auth_cert_file.txt
index 1e68a4d..aaa5abf 100644
--- a/caddytest/integration/caddyfile_adapt/tls_client_auth_cert_file.txt
+++ b/caddytest/integration/caddyfile_adapt/tls_client_auth_cert_file.txt
@@ -3,7 +3,7 @@ localhost
respond "hello from localhost"
tls {
client_auth {
- mode request
+ mode request
trusted_ca_cert_file ../caddy.ca.cer
}
}
diff --git a/caddytest/integration/caddyfile_adapt/tls_client_auth_inline_cert.txt b/caddytest/integration/caddyfile_adapt/tls_client_auth_inline_cert.txt
index 028d3b1..4cd4581 100644
--- a/caddytest/integration/caddyfile_adapt/tls_client_auth_inline_cert.txt
+++ b/caddytest/integration/caddyfile_adapt/tls_client_auth_inline_cert.txt
@@ -3,8 +3,8 @@ localhost
respond "hello from localhost"
tls {
client_auth {
- mode request
- trusted_ca_cert MIIDSzCCAjOgAwIBAgIUfIRObjWNUA4jxQ/0x8BOCvE2Vw4wDQYJKoZIhvcNAQELBQAwFjEUMBIGA1UEAwwLRWFzeS1SU0EgQ0EwHhcNMTkwODI4MTYyNTU5WhcNMjkwODI1MTYyNTU5WjAWMRQwEgYDVQQDDAtFYXN5LVJTQSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK5m5elxhQfMp/3aVJ4JnpN9PUSz6LlP6LePAPFU7gqohVVFVtDkChJAG3FNkNQNlieVTja/bgH9IcC6oKbROwdY1h0MvNV8AHHigvl03WuJD8g2ReVFXXwsnrPmKXCFzQyMI6TYk3m2gYrXsZOU1GLnfMRC3KAMRgE2F45twOs9hqG169YJ6mM2eQjzjCHWI6S2/iUYvYxRkCOlYUbLsMD/AhgAf1plzg6LPqNxtdlwxZnA0ytgkmhK67HtzJu0+ovUCsMv0RwcMhsEo9T8nyFAGt9XLZ63X5WpBCTUApaAUhnG0XnerjmUWb6eUWw4zev54sEfY5F3x002iQaW6cECAwEAAaOBkDCBjTAdBgNVHQ4EFgQU4CBUbZsS2GaNIkGRz/cBsD5ivjswUQYDVR0jBEowSIAU4CBUbZsS2GaNIkGRz/cBsD5ivjuhGqQYMBYxFDASBgNVBAMMC0Vhc3ktUlNBIENBghR8hE5uNY1QDiPFD/THwE4K8TZXDjAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAKB3V4HIzoiO/Ch6WMj9bLJ2FGbpkMrcb/Eq01hT5zcfKD66lVS1MlK+cRL446Z2b2KDP1oFyVs+qmrmtdwrWgD+nfe2sBmmIHo9m9KygMkEOfG3MghGTEcS+0cTKEcoHYWYyOqQh6jnedXY8Cdm4GM1hAc9MiL3/sqV8YCVSLNnkoNysmr06/rZ0MCUZPGUtRmfd0heWhrfzAKw2HLgX+RAmpOE2MZqWcjvqKGyaRiaZks4nJkP6521aC2Lgp0HhCz1j8/uQ5ldoDszCnu/iro0NAsNtudTMD+YoLQxLqdleIh6CW+illc2VdXwj7mn6J04yns9jfE2jRjW/yTLFuQ==
+ mode request
+ trusted_ca_cert MIIDSzCCAjOgAwIBAgIUfIRObjWNUA4jxQ/0x8BOCvE2Vw4wDQYJKoZIhvcNAQELBQAwFjEUMBIGA1UEAwwLRWFzeS1SU0EgQ0EwHhcNMTkwODI4MTYyNTU5WhcNMjkwODI1MTYyNTU5WjAWMRQwEgYDVQQDDAtFYXN5LVJTQSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK5m5elxhQfMp/3aVJ4JnpN9PUSz6LlP6LePAPFU7gqohVVFVtDkChJAG3FNkNQNlieVTja/bgH9IcC6oKbROwdY1h0MvNV8AHHigvl03WuJD8g2ReVFXXwsnrPmKXCFzQyMI6TYk3m2gYrXsZOU1GLnfMRC3KAMRgE2F45twOs9hqG169YJ6mM2eQjzjCHWI6S2/iUYvYxRkCOlYUbLsMD/AhgAf1plzg6LPqNxtdlwxZnA0ytgkmhK67HtzJu0+ovUCsMv0RwcMhsEo9T8nyFAGt9XLZ63X5WpBCTUApaAUhnG0XnerjmUWb6eUWw4zev54sEfY5F3x002iQaW6cECAwEAAaOBkDCBjTAdBgNVHQ4EFgQU4CBUbZsS2GaNIkGRz/cBsD5ivjswUQYDVR0jBEowSIAU4CBUbZsS2GaNIkGRz/cBsD5ivjuhGqQYMBYxFDASBgNVBAMMC0Vhc3ktUlNBIENBghR8hE5uNY1QDiPFD/THwE4K8TZXDjAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAQEAKB3V4HIzoiO/Ch6WMj9bLJ2FGbpkMrcb/Eq01hT5zcfKD66lVS1MlK+cRL446Z2b2KDP1oFyVs+qmrmtdwrWgD+nfe2sBmmIHo9m9KygMkEOfG3MghGTEcS+0cTKEcoHYWYyOqQh6jnedXY8Cdm4GM1hAc9MiL3/sqV8YCVSLNnkoNysmr06/rZ0MCUZPGUtRmfd0heWhrfzAKw2HLgX+RAmpOE2MZqWcjvqKGyaRiaZks4nJkP6521aC2Lgp0HhCz1j8/uQ5ldoDszCnu/iro0NAsNtudTMD+YoLQxLqdleIh6CW+illc2VdXwj7mn6J04yns9jfE2jRjW/yTLFuQ==
}
}
----------
diff --git a/caddytest/integration/caddyfile_adapt/tls_conn_policy_consolidate.txt b/caddytest/integration/caddyfile_adapt/tls_conn_policy_consolidate.txt
index ba6827e..68e89b0 100644
--- a/caddytest/integration/caddyfile_adapt/tls_conn_policy_consolidate.txt
+++ b/caddytest/integration/caddyfile_adapt/tls_conn_policy_consolidate.txt
@@ -75,12 +75,7 @@ http://b.b https://b.b:8443 {
],
"terminal": true
}
- ],
- "automatic_https": {
- "skip": [
- "b.b"
- ]
- }
+ ]
},
"srv2": {
"listen": [