Browse Source

Couple of quick fixes

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

2
caddyconfig/httpcaddyfile/httptype.go

@ -203,7 +203,7 @@ func (st ServerType) Setup(originalServerBlocks []caddyfile.ServerBlock,
if clVals, ok := sblock.pile["tls.certificate_loader"]; ok {
for _, clVal := range clVals {
loader := clVal.Value.(caddytls.CertificateLoader)
loaderName := caddy.GetModuleID(loader)
loaderName := caddy.GetModuleName(loader)
tlsApp.CertificatesRaw[loaderName] = caddyconfig.JSON(loader, &warnings)
}
}

1
logging.go

@ -342,6 +342,7 @@ func (cl *CustomLog) provision(ctx Context, logging *Logging) error {
if err != nil {
return fmt.Errorf("invalid log level: %v", err)
}
level = strings.ToLower(level)
// set up the log level
switch level {

Loading…
Cancel
Save