From 4b75f3e2f09b77b98783ea4d6602391c7283f984 Mon Sep 17 00:00:00 2001 From: Francis Lavoie Date: Fri, 25 Mar 2022 00:48:45 -0400 Subject: chore: Clean up adapt test line endings (#4660) Lots of the files were using CRLF instead of LF. Mostly my fault cause sometimes I make the files on Windows and VSCode for some reason kept making them with the wrong line endings. Sigh. Since .txt files typically default to spaces for indentation, I'm also adding an .editorconfig to ensure they use tabs instead --- .../reverse_proxy_trusted_proxies.txt | 112 ++++++++++----------- 1 file changed, 56 insertions(+), 56 deletions(-) (limited to 'caddytest/integration/caddyfile_adapt/reverse_proxy_trusted_proxies.txt') diff --git a/caddytest/integration/caddyfile_adapt/reverse_proxy_trusted_proxies.txt b/caddytest/integration/caddyfile_adapt/reverse_proxy_trusted_proxies.txt index 5e11284..f1e685c 100644 --- a/caddytest/integration/caddyfile_adapt/reverse_proxy_trusted_proxies.txt +++ b/caddytest/integration/caddyfile_adapt/reverse_proxy_trusted_proxies.txt @@ -1,56 +1,56 @@ -:8884 - -reverse_proxy 127.0.0.1:65535 { - trusted_proxies 127.0.0.1 -} - -reverse_proxy 127.0.0.1:65535 { - trusted_proxies private_ranges -} ----------- -{ - "apps": { - "http": { - "servers": { - "srv0": { - "listen": [ - ":8884" - ], - "routes": [ - { - "handle": [ - { - "handler": "reverse_proxy", - "trusted_proxies": [ - "127.0.0.1" - ], - "upstreams": [ - { - "dial": "127.0.0.1:65535" - } - ] - }, - { - "handler": "reverse_proxy", - "trusted_proxies": [ - "192.168.0.0/16", - "172.16.0.0/12", - "10.0.0.0/8", - "127.0.0.1/8", - "fd00::/8", - "::1" - ], - "upstreams": [ - { - "dial": "127.0.0.1:65535" - } - ] - } - ] - } - ] - } - } - } - } -} +:8884 + +reverse_proxy 127.0.0.1:65535 { + trusted_proxies 127.0.0.1 +} + +reverse_proxy 127.0.0.1:65535 { + trusted_proxies private_ranges +} +---------- +{ + "apps": { + "http": { + "servers": { + "srv0": { + "listen": [ + ":8884" + ], + "routes": [ + { + "handle": [ + { + "handler": "reverse_proxy", + "trusted_proxies": [ + "127.0.0.1" + ], + "upstreams": [ + { + "dial": "127.0.0.1:65535" + } + ] + }, + { + "handler": "reverse_proxy", + "trusted_proxies": [ + "192.168.0.0/16", + "172.16.0.0/12", + "10.0.0.0/8", + "127.0.0.1/8", + "fd00::/8", + "::1" + ], + "upstreams": [ + { + "dial": "127.0.0.1:65535" + } + ] + } + ] + } + ] + } + } + } + } +} -- cgit v1.2.3