serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-26 21:53:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Little tweaky tweaks

Browse source
This commit is contained in:
Matthew Holt 2020-03-18 15:51:31 -06:00
parent 89124aa570
commit ce45353e61
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
caddyconfig/httpcaddyfile/builtins.go
View file

@ -102,6 +102,7 @@ func parseRoot(h Helper) ([]ConfigValue, error) {
// alpn <values...>
// load <paths...>
// ca <acme_ca_endpoint>
// ca_root <pem_file>
// dns <provider_name>
// on_demand
// }

4
caddyconfig/httpcaddyfile/httptype.go
View file

@ -282,6 +282,8 @@ func (ServerType) evaluateGlobalOptionsBlock(serverBlocks []serverBlock, options
var err error
disp := caddyfile.NewDispenser(segment)
switch dir {
case "debug":
val = true
case "http_port":
val, err = parseOptHTTPPort(disp)
case "https_port":
@ -300,8 +302,6 @@ func (ServerType) evaluateGlobalOptionsBlock(serverBlocks []serverBlock, options
val, err = parseOptSingleString(disp)
case "admin":
val, err = parseOptAdmin(disp)
case "debug":
options["debug"] = true
case "on_demand_tls":
val, err = parseOptOnDemand(disp)
case "local_certs":