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 --- .../php_fastcgi_try_files_override.txt | 248 ++++++++++----------- 1 file changed, 124 insertions(+), 124 deletions(-) (limited to 'caddytest/integration/caddyfile_adapt/php_fastcgi_try_files_override.txt') diff --git a/caddytest/integration/caddyfile_adapt/php_fastcgi_try_files_override.txt b/caddytest/integration/caddyfile_adapt/php_fastcgi_try_files_override.txt index 2f4ef76..4342786 100644 --- a/caddytest/integration/caddyfile_adapt/php_fastcgi_try_files_override.txt +++ b/caddytest/integration/caddyfile_adapt/php_fastcgi_try_files_override.txt @@ -1,124 +1,124 @@ -:8884 - -php_fastcgi localhost:9000 { - # some php_fastcgi-specific subdirectives - split .php .php5 - env VAR1 value1 - env VAR2 value2 - root /var/www - try_files {path} {path}/index.php =404 - dial_timeout 3s - read_timeout 10s - write_timeout 20s - - # passed through to reverse_proxy (directive order doesn't matter!) - lb_policy random -} ----------- -{ - "apps": { - "http": { - "servers": { - "srv0": { - "listen": [ - ":8884" - ], - "routes": [ - { - "match": [ - { - "file": { - "try_files": [ - "{http.request.uri.path}/index.php" - ] - }, - "not": [ - { - "path": [ - "*/" - ] - } - ] - } - ], - "handle": [ - { - "handler": "static_response", - "headers": { - "Location": [ - "{http.request.uri.path}/" - ] - }, - "status_code": 308 - } - ] - }, - { - "match": [ - { - "file": { - "try_files": [ - "{http.request.uri.path}", - "{http.request.uri.path}/index.php", - "=404" - ], - "split_path": [ - ".php", - ".php5" - ] - } - } - ], - "handle": [ - { - "handler": "rewrite", - "uri": "{http.matchers.file.relative}" - } - ] - }, - { - "match": [ - { - "path": [ - "*.php", - "*.php5" - ] - } - ], - "handle": [ - { - "handler": "reverse_proxy", - "load_balancing": { - "selection_policy": { - "policy": "random" - } - }, - "transport": { - "dial_timeout": 3000000000, - "env": { - "VAR1": "value1", - "VAR2": "value2" - }, - "protocol": "fastcgi", - "read_timeout": 10000000000, - "root": "/var/www", - "split_path": [ - ".php", - ".php5" - ], - "write_timeout": 20000000000 - }, - "upstreams": [ - { - "dial": "localhost:9000" - } - ] - } - ] - } - ] - } - } - } - } -} +:8884 + +php_fastcgi localhost:9000 { + # some php_fastcgi-specific subdirectives + split .php .php5 + env VAR1 value1 + env VAR2 value2 + root /var/www + try_files {path} {path}/index.php =404 + dial_timeout 3s + read_timeout 10s + write_timeout 20s + + # passed through to reverse_proxy (directive order doesn't matter!) + lb_policy random +} +---------- +{ + "apps": { + "http": { + "servers": { + "srv0": { + "listen": [ + ":8884" + ], + "routes": [ + { + "match": [ + { + "file": { + "try_files": [ + "{http.request.uri.path}/index.php" + ] + }, + "not": [ + { + "path": [ + "*/" + ] + } + ] + } + ], + "handle": [ + { + "handler": "static_response", + "headers": { + "Location": [ + "{http.request.uri.path}/" + ] + }, + "status_code": 308 + } + ] + }, + { + "match": [ + { + "file": { + "try_files": [ + "{http.request.uri.path}", + "{http.request.uri.path}/index.php", + "=404" + ], + "split_path": [ + ".php", + ".php5" + ] + } + } + ], + "handle": [ + { + "handler": "rewrite", + "uri": "{http.matchers.file.relative}" + } + ] + }, + { + "match": [ + { + "path": [ + "*.php", + "*.php5" + ] + } + ], + "handle": [ + { + "handler": "reverse_proxy", + "load_balancing": { + "selection_policy": { + "policy": "random" + } + }, + "transport": { + "dial_timeout": 3000000000, + "env": { + "VAR1": "value1", + "VAR2": "value2" + }, + "protocol": "fastcgi", + "read_timeout": 10000000000, + "root": "/var/www", + "split_path": [ + ".php", + ".php5" + ], + "write_timeout": 20000000000 + }, + "upstreams": [ + { + "dial": "localhost:9000" + } + ] + } + ] + } + ] + } + } + } + } +} -- cgit v1.2.3