diff options
| author | Francis Lavoie <lavofr@gmail.com> | 2020-11-23 14:46:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-23 12:46:50 -0700 |
| commit | 3cfefeb0f71d54f1d9a76a63be7b97d0943c88ef (patch) | |
| tree | efc01573221ab12af054df6b1b7832a88adf6fd3 /caddytest/integration/caddyfile_adapt/handle_path_sorting.txt | |
| parent | 4a641f6c6fb441a8301eeb8cab0c0b61de70ff7f (diff) | |
httpcaddyfile: Configure servers via global options (#3836)
* httpcaddyfile: First pass at implementing server options
* httpcaddyfile: Add listener wrapper support
* httpcaddyfile: Sort sbaddrs to make adapt output more deterministic
* httpcaddyfile: Add server options adapt tests
* httpcaddyfile: Windows line endings lol
* caddytest: More windows line endings lol (sorry Matt)
* Update caddyconfig/httpcaddyfile/serveroptions.go
Co-authored-by: Matt Holt <mholt@users.noreply.github.com>
* httpcaddyfile: Reword listener address "matcher"
* Apply suggestions from code review
Co-authored-by: Matt Holt <mholt@users.noreply.github.com>
* httpcaddyfile: Deprecate experimental_http3 option (moved to servers)
* httpcaddyfile: Remove validation step, no longer needed
Co-authored-by: Matt Holt <mholt@users.noreply.github.com>
Diffstat (limited to 'caddytest/integration/caddyfile_adapt/handle_path_sorting.txt')
| -rw-r--r-- | caddytest/integration/caddyfile_adapt/handle_path_sorting.txt | 208 |
1 files changed, 104 insertions, 104 deletions
diff --git a/caddytest/integration/caddyfile_adapt/handle_path_sorting.txt b/caddytest/integration/caddyfile_adapt/handle_path_sorting.txt index 3258dc9..0a89f2a 100644 --- a/caddytest/integration/caddyfile_adapt/handle_path_sorting.txt +++ b/caddytest/integration/caddyfile_adapt/handle_path_sorting.txt @@ -1,105 +1,105 @@ -:80 {
- handle /api/* {
- respond "api"
- }
-
- handle_path /static/* {
- respond "static"
- }
-
- handle {
- respond "handle"
- }
-}
-----------
-{
- "apps": {
- "http": {
- "servers": {
- "srv0": {
- "listen": [
- ":80"
- ],
- "routes": [
- {
- "group": "group3",
- "match": [
- {
- "path": [
- "/static/*"
- ]
- }
- ],
- "handle": [
- {
- "handler": "subroute",
- "routes": [
- {
- "handle": [
- {
- "handler": "rewrite",
- "strip_path_prefix": "/static"
- }
- ]
- },
- {
- "handle": [
- {
- "body": "static",
- "handler": "static_response"
- }
- ]
- }
- ]
- }
- ]
- },
- {
- "group": "group3",
- "match": [
- {
- "path": [
- "/api/*"
- ]
- }
- ],
- "handle": [
- {
- "handler": "subroute",
- "routes": [
- {
- "handle": [
- {
- "body": "api",
- "handler": "static_response"
- }
- ]
- }
- ]
- }
- ]
- },
- {
- "group": "group3",
- "handle": [
- {
- "handler": "subroute",
- "routes": [
- {
- "handle": [
- {
- "body": "handle",
- "handler": "static_response"
- }
- ]
- }
- ]
- }
- ]
- }
- ]
- }
- }
- }
- }
+:80 { + handle /api/* { + respond "api" + } + + handle_path /static/* { + respond "static" + } + + handle { + respond "handle" + } +} +---------- +{ + "apps": { + "http": { + "servers": { + "srv0": { + "listen": [ + ":80" + ], + "routes": [ + { + "group": "group3", + "match": [ + { + "path": [ + "/static/*" + ] + } + ], + "handle": [ + { + "handler": "subroute", + "routes": [ + { + "handle": [ + { + "handler": "rewrite", + "strip_path_prefix": "/static" + } + ] + }, + { + "handle": [ + { + "body": "static", + "handler": "static_response" + } + ] + } + ] + } + ] + }, + { + "group": "group3", + "match": [ + { + "path": [ + "/api/*" + ] + } + ], + "handle": [ + { + "handler": "subroute", + "routes": [ + { + "handle": [ + { + "body": "api", + "handler": "static_response" + } + ] + } + ] + } + ] + }, + { + "group": "group3", + "handle": [ + { + "handler": "subroute", + "routes": [ + { + "handle": [ + { + "body": "handle", + "handler": "static_response" + } + ] + } + ] + } + ] + } + ] + } + } + } + } }
\ No newline at end of file |