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/log_filters.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/log_filters.txt')
-rw-r--r-- | caddytest/integration/caddyfile_adapt/log_filters.txt | 136 |
1 files changed, 68 insertions, 68 deletions
diff --git a/caddytest/integration/caddyfile_adapt/log_filters.txt b/caddytest/integration/caddyfile_adapt/log_filters.txt index 549f4e6..ab11807 100644 --- a/caddytest/integration/caddyfile_adapt/log_filters.txt +++ b/caddytest/integration/caddyfile_adapt/log_filters.txt @@ -1,69 +1,69 @@ -:80
-
-log {
- output stdout
- format filter {
- wrap console
- fields {
- request>headers>Authorization delete
- request>headers>Server delete
- request>remote_addr ip_mask {
- ipv4 24
- ipv6 32
- }
- }
- }
-}
-----------
-{
- "logging": {
- "logs": {
- "default": {
- "exclude": [
- "http.log.access.log0"
- ]
- },
- "log0": {
- "writer": {
- "output": "stdout"
- },
- "encoder": {
- "fields": {
- "request\u003eheaders\u003eAuthorization": {
- "filter": "delete"
- },
- "request\u003eheaders\u003eServer": {
- "filter": "delete"
- },
- "request\u003eremote_addr": {
- "filter": "ip_mask",
- "ipv4_cidr": 24,
- "ipv6_cidr": 32
- }
- },
- "format": "filter",
- "wrap": {
- "format": "console"
- }
- },
- "include": [
- "http.log.access.log0"
- ]
- }
- }
- },
- "apps": {
- "http": {
- "servers": {
- "srv0": {
- "listen": [
- ":80"
- ],
- "logs": {
- "default_logger_name": "log0"
- }
- }
- }
- }
- }
+:80 + +log { + output stdout + format filter { + wrap console + fields { + request>headers>Authorization delete + request>headers>Server delete + request>remote_addr ip_mask { + ipv4 24 + ipv6 32 + } + } + } +} +---------- +{ + "logging": { + "logs": { + "default": { + "exclude": [ + "http.log.access.log0" + ] + }, + "log0": { + "writer": { + "output": "stdout" + }, + "encoder": { + "fields": { + "request\u003eheaders\u003eAuthorization": { + "filter": "delete" + }, + "request\u003eheaders\u003eServer": { + "filter": "delete" + }, + "request\u003eremote_addr": { + "filter": "ip_mask", + "ipv4_cidr": 24, + "ipv6_cidr": 32 + } + }, + "format": "filter", + "wrap": { + "format": "console" + } + }, + "include": [ + "http.log.access.log0" + ] + } + } + }, + "apps": { + "http": { + "servers": { + "srv0": { + "listen": [ + ":80" + ], + "logs": { + "default_logger_name": "log0" + } + } + } + } + } }
\ No newline at end of file |