diff options
| author | Francis Lavoie <lavofr@gmail.com> | 2020-05-11 17:00:35 -0400 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-11 15:00:35 -0600 | 
| commit | dc9f4f13fc1cc102c713c69ded295b3fcf685e96 (patch) | |
| tree | cbc2bc158947509b222908bbad862ac5581f1cb4 /caddytest | |
| parent | 4c55d26f11329243591d04ca5a52298b38bca9a8 (diff) | |
httpcaddyfile: Make global options pluggable (#3265)
* httpcaddyfile: Make global options pluggable
* httpcaddyfile: Add a global options adapt test
* httpcaddyfile: Wrap err
Co-Authored-By: Dave Henderson <dhenderson@gmail.com>
* httpcaddyfile: Revert wrap err
Co-authored-by: Dave Henderson <dhenderson@gmail.com>
Diffstat (limited to 'caddytest')
| -rw-r--r-- | caddytest/integration/caddyfile_adapt_test.go | 74 | 
1 files changed, 74 insertions, 0 deletions
diff --git a/caddytest/integration/caddyfile_adapt_test.go b/caddytest/integration/caddyfile_adapt_test.go index 514a506..c2ad892 100644 --- a/caddytest/integration/caddyfile_adapt_test.go +++ b/caddytest/integration/caddyfile_adapt_test.go @@ -415,3 +415,77 @@ func TestNotBlockMerging(t *testing.T) {  	}  }`)  } + +func TestGlobalOptions(t *testing.T) { +	caddytest.AssertAdapt(t, `  +	{ +		debug +		http_port 8080 +		https_port 8443 +		default_sni localhost +		order root first +		storage file_system { +			root /data +		} +		acme_ca https://example.com +		acme_ca_root /path/to/ca.crt +		email test@example.com +		admin off +		on_demand_tls { +			ask https://example.com +			interval 30s +			burst 20 +		} +		local_certs +		key_type ed25519 +	} + +	:80 +  `, "caddyfile", `{ +	"admin": { +		"disabled": true +	}, +	"logging": { +		"logs": { +			"default": { +				"level": "DEBUG" +			} +		} +	}, +	"storage": { +		"module": "file_system", +		"root": "/data" +	}, +	"apps": { +		"http": { +			"http_port": 8080, +			"https_port": 8443, +			"servers": { +				"srv0": { +					"listen": [ +						":80" +					] +				} +			} +		}, +		"tls": { +			"automation": { +				"policies": [ +					{ +						"issuer": { +							"module": "internal" +						} +					} +				], +				"on_demand": { +					"rate_limit": { +						"interval": 30000000000, +						"burst": 20 +					}, +					"ask": "https://example.com" +				} +			} +		} +	} +}`) +}  | 
