diff options
author | Matthew Holt <mholt@users.noreply.github.com> | 2019-12-13 15:36:00 -0700 |
---|---|---|
committer | Matthew Holt <mholt@users.noreply.github.com> | 2019-12-13 15:36:00 -0700 |
commit | 8005b7ab73c264ee3c1d7b10c39bc5565ef57c02 (patch) | |
tree | 984a146668b09f6b8190784ec40fe9d2225d74ea | |
parent | b1a456cfe38e83eedb778032ed6739e7e3cbe8a4 (diff) |
Couple of quick fixes
-rw-r--r-- | caddyconfig/httpcaddyfile/httptype.go | 2 | ||||
-rw-r--r-- | logging.go | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/caddyconfig/httpcaddyfile/httptype.go b/caddyconfig/httpcaddyfile/httptype.go index 2db3e7c..2b2855d 100644 --- a/caddyconfig/httpcaddyfile/httptype.go +++ b/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) } } @@ -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 { |