serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-26 21:53:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

run golangci-lint run --fix --fast (#6270)

Browse source
This commit is contained in:
Mohammed Al Sahaf 2024-04-25 00:17:23 +03:00 committed by GitHub
parent 76c4cf5a56
commit c6eb186064
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
caddyconfig/caddyfile/parse.go
View file

@ -395,7 +395,6 @@ func (p *parser) doImport(nesting int) error {
return p.Errf("Glob pattern may only contain one wildcard (*), but has others: %s", globPattern) return p.Errf("Glob pattern may only contain one wildcard (*), but has others: %s", globPattern)
} }
matches, err = filepath.Glob(globPattern) matches, err = filepath.Glob(globPattern)
if err != nil { if err != nil {
return p.Errf("Failed to use import pattern %s: %v", importPattern, err) return p.Errf("Failed to use import pattern %s: %v", importPattern, err)
} }

2
modules/caddytls/acmeissuer.go
View file

@ -372,7 +372,7 @@ func (iss *ACMEIssuer) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
return d.Errf("lifetime must be >= 0: %s", lifetime) return d.Errf("lifetime must be >= 0: %s", lifetime)
} }
iss.CertificateLifetime = caddy.Duration(lifetime) iss.CertificateLifetime = caddy.Duration(lifetime)
case "dir": case "dir":
if iss.CA != "" { if iss.CA != "" {
return d.Errf("directory is already specified: %s", iss.CA) return d.Errf("directory is already specified: %s", iss.CA)