mirror of
				https://github.com/caddyserver/caddy.git
				synced 2025-10-31 02:27:19 -04:00 
			
		
		
		
	Previous commit improved the Caddyfile adapter so it doesn't unnecessarily add names to "skip" in "auto_https" when the server is already HTTP-only. This commit updates the tests to reflect that change, while also fixing the Caddyfile formatting in many of the tests. We also print the line number of the divergence between input and formatted version in Caddyfile adapt warnings - very useful for finding initial formatting problems.
		
			
				
	
	
		
			133 lines
		
	
	
		
			2.2 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
			
		
		
	
	
			133 lines
		
	
	
		
			2.2 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
| :80 {
 | |
| 	header Denis "Ritchie"
 | |
| 	header +Edsger "Dijkstra"
 | |
| 	header ?John "von Neumann"
 | |
| 	header -Wolfram
 | |
| 	header {
 | |
| 		Grace: "Hopper" # some users habitually suffix field names with a colon
 | |
| 		+Ray "Solomonoff"
 | |
| 		?Tim "Berners-Lee"
 | |
| 		defer
 | |
| 	}
 | |
| 	@images path /images/*
 | |
| 	header @images {
 | |
| 		Cache-Control "public, max-age=3600, stale-while-revalidate=86400"
 | |
| 	}
 | |
| }
 | |
| ----------
 | |
| {
 | |
| 	"apps": {
 | |
| 		"http": {
 | |
| 			"servers": {
 | |
| 				"srv0": {
 | |
| 					"listen": [
 | |
| 						":80"
 | |
| 					],
 | |
| 					"routes": [
 | |
| 						{
 | |
| 							"match": [
 | |
| 								{
 | |
| 									"path": [
 | |
| 										"/images/*"
 | |
| 									]
 | |
| 								}
 | |
| 							],
 | |
| 							"handle": [
 | |
| 								{
 | |
| 									"handler": "headers",
 | |
| 									"response": {
 | |
| 										"set": {
 | |
| 											"Cache-Control": [
 | |
| 												"public, max-age=3600, stale-while-revalidate=86400"
 | |
| 											]
 | |
| 										}
 | |
| 									}
 | |
| 								}
 | |
| 							]
 | |
| 						},
 | |
| 						{
 | |
| 							"handle": [
 | |
| 								{
 | |
| 									"handler": "headers",
 | |
| 									"response": {
 | |
| 										"set": {
 | |
| 											"Denis": [
 | |
| 												"Ritchie"
 | |
| 											]
 | |
| 										}
 | |
| 									}
 | |
| 								},
 | |
| 								{
 | |
| 									"handler": "headers",
 | |
| 									"response": {
 | |
| 										"add": {
 | |
| 											"Edsger": [
 | |
| 												"Dijkstra"
 | |
| 											]
 | |
| 										}
 | |
| 									}
 | |
| 								},
 | |
| 								{
 | |
| 									"handler": "headers",
 | |
| 									"response": {
 | |
| 										"require": {
 | |
| 											"headers": {
 | |
| 												"John": null
 | |
| 											}
 | |
| 										},
 | |
| 										"set": {
 | |
| 											"John": [
 | |
| 												"von Neumann"
 | |
| 											]
 | |
| 										}
 | |
| 									}
 | |
| 								},
 | |
| 								{
 | |
| 									"handler": "headers",
 | |
| 									"response": {
 | |
| 										"deferred": true,
 | |
| 										"delete": [
 | |
| 											"Wolfram"
 | |
| 										]
 | |
| 									}
 | |
| 								},
 | |
| 								{
 | |
| 									"handler": "headers",
 | |
| 									"response": {
 | |
| 										"add": {
 | |
| 											"Ray": [
 | |
| 												"Solomonoff"
 | |
| 											]
 | |
| 										},
 | |
| 										"deferred": true,
 | |
| 										"set": {
 | |
| 											"Grace": [
 | |
| 												"Hopper"
 | |
| 											]
 | |
| 										}
 | |
| 									}
 | |
| 								},
 | |
| 								{
 | |
| 									"handler": "headers",
 | |
| 									"response": {
 | |
| 										"require": {
 | |
| 											"headers": {
 | |
| 												"Tim": null
 | |
| 											}
 | |
| 										},
 | |
| 										"set": {
 | |
| 											"Tim": [
 | |
| 												"Berners-Lee"
 | |
| 											]
 | |
| 										}
 | |
| 									}
 | |
| 								}
 | |
| 							]
 | |
| 						}
 | |
| 					]
 | |
| 				}
 | |
| 			}
 | |
| 		}
 | |
| 	}
 | |
| }
 |