Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS
Mirrored from https://github.com/Slazee/caddy.git
Synced Nov 14, 05:15 UTC
Couple of quick fixes
Matthew Holt committed
Dec 13, 2019 at 15:36 UTC
8005b7ab73c264ee3c1d7b10c39bc5565ef57c02
2 files changed
+2
-1
caddyconfig/httpcaddyfile/httptype.go
+1
-1
@@ -203,7 +203,7 @@ func (st ServerType) Setup(originalServerBlocks []caddyfile.ServerBlock,
203
if clVals, ok := sblock.pile["tls.certificate_loader"]; ok {
204
for _, clVal := range clVals {
205
loader := clVal.Value.(caddytls.CertificateLoader)
206
- loaderName := caddy.GetModuleID(loader)
206
+ loaderName := caddy.GetModuleName(loader)
207
tlsApp.CertificatesRaw[loaderName] = caddyconfig.JSON(loader, &warnings)
208
}
209
}
logging.go
+1
@@ -342,6 +342,7 @@ func (cl *CustomLog) provision(ctx Context, logging *Logging) error {
342
if err != nil {
343
return fmt.Errorf("invalid log level: %v", err)
344
}
345
+ level = strings.ToLower(level)
346
347
// set up the log level
348
switch level {