diff options
| author | Matt Holt <[email protected]> | 2024-04-24 17:21:10 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-04-24 17:21:10 -0400 |
| commit | 4b9860e741af75df0d7da6d6eac1f55904ae8585 (patch) | |
| tree | 7269522dd91de218a12b4b1db8da0cbe7a41beb6 | |
| parent | c66e0ee7de66b9202074054890fbad5ce5e7e0e3 (diff) | |
| parent | c6eb186064091c79f46d03fd0fc5c233c686566f (diff) | |
| download | caddy-4b9860e741af75df0d7da6d6eac1f55904ae8585.tar.gz caddy-4b9860e741af75df0d7da6d6eac1f55904ae8585.zip | |
Merge branch 'master' into tls-cert-cache-internal-reload
| -rw-r--r-- | caddyconfig/caddyfile/parse.go | 1 | ||||
| -rw-r--r-- | modules/caddytls/acmeissuer.go | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/caddyconfig/caddyfile/parse.go b/caddyconfig/caddyfile/parse.go index cdb9a7619..a865b70df 100644 --- a/caddyconfig/caddyfile/parse.go +++ b/caddyconfig/caddyfile/parse.go @@ -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) } matches, err = filepath.Glob(globPattern) - if err != nil { return p.Errf("Failed to use import pattern %s: %v", importPattern, err) } diff --git a/modules/caddytls/acmeissuer.go b/modules/caddytls/acmeissuer.go index 1f57c7e38..7eeca3eb9 100644 --- a/modules/caddytls/acmeissuer.go +++ b/modules/caddytls/acmeissuer.go @@ -372,7 +372,7 @@ func (iss *ACMEIssuer) UnmarshalCaddyfile(d *caddyfile.Dispenser) error { return d.Errf("lifetime must be >= 0: %s", lifetime) } iss.CertificateLifetime = caddy.Duration(lifetime) - + case "dir": if iss.CA != "" { return d.Errf("directory is already specified: %s", iss.CA) |