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/import_args_snippet.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/import_args_snippet.txt')
| -rw-r--r-- | caddytest/integration/caddyfile_adapt/import_args_snippet.txt | 164 |
1 files changed, 82 insertions, 82 deletions
diff --git a/caddytest/integration/caddyfile_adapt/import_args_snippet.txt b/caddytest/integration/caddyfile_adapt/import_args_snippet.txt index 8d2ff34..9fce9ab 100644 --- a/caddytest/integration/caddyfile_adapt/import_args_snippet.txt +++ b/caddytest/integration/caddyfile_adapt/import_args_snippet.txt @@ -1,83 +1,83 @@ -(logging) {
- log {
- output file /var/log/caddy/{args.0}.access.log
- }
-}
-
-a.example.com {
- import logging a.example.com
-}
-
-b.example.com {
- import logging b.example.com
-}
-----------
-{
- "logging": {
- "logs": {
- "default": {
- "exclude": [
- "http.log.access.log0",
- "http.log.access.log1"
- ]
- },
- "log0": {
- "writer": {
- "filename": "/var/log/caddy/a.example.com.access.log",
- "output": "file"
- },
- "include": [
- "http.log.access.log0"
- ]
- },
- "log1": {
- "writer": {
- "filename": "/var/log/caddy/b.example.com.access.log",
- "output": "file"
- },
- "include": [
- "http.log.access.log1"
- ]
- }
- }
- },
- "apps": {
- "http": {
- "servers": {
- "srv0": {
- "listen": [
- ":443"
- ],
- "routes": [
- {
- "match": [
- {
- "host": [
- "a.example.com"
- ]
- }
- ],
- "terminal": true
- },
- {
- "match": [
- {
- "host": [
- "b.example.com"
- ]
- }
- ],
- "terminal": true
- }
- ],
- "logs": {
- "logger_names": {
- "a.example.com": "log0",
- "b.example.com": "log1"
- }
- }
- }
- }
- }
- }
+(logging) { + log { + output file /var/log/caddy/{args.0}.access.log + } +} + +a.example.com { + import logging a.example.com +} + +b.example.com { + import logging b.example.com +} +---------- +{ + "logging": { + "logs": { + "default": { + "exclude": [ + "http.log.access.log0", + "http.log.access.log1" + ] + }, + "log0": { + "writer": { + "filename": "/var/log/caddy/a.example.com.access.log", + "output": "file" + }, + "include": [ + "http.log.access.log0" + ] + }, + "log1": { + "writer": { + "filename": "/var/log/caddy/b.example.com.access.log", + "output": "file" + }, + "include": [ + "http.log.access.log1" + ] + } + } + }, + "apps": { + "http": { + "servers": { + "srv0": { + "listen": [ + ":443" + ], + "routes": [ + { + "match": [ + { + "host": [ + "a.example.com" + ] + } + ], + "terminal": true + }, + { + "match": [ + { + "host": [ + "b.example.com" + ] + } + ], + "terminal": true + } + ], + "logs": { + "logger_names": { + "a.example.com": "log0", + "b.example.com": "log1" + } + } + } + } + } + } }
\ No newline at end of file |