Browse Source

Little tweaky tweaks

master
Matthew Holt 5 years ago
parent
commit
ce45353e61
No known key found for this signature in database GPG Key ID: 2A349DD577D586A5
  1. 1
      caddyconfig/httpcaddyfile/builtins.go
  2. 4
      caddyconfig/httpcaddyfile/httptype.go

1
caddyconfig/httpcaddyfile/builtins.go

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

4
caddyconfig/httpcaddyfile/httptype.go

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

Loading…
Cancel
Save