Matthew Holt
5 years ago
No known key found for this signature in database
GPG Key ID: 2A349DD577D586A5
2 changed files with
2 additions and
1 deletions
-
caddyconfig/httpcaddyfile/httptype.go
-
logging.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 { |
|
|
|