From 12f594779c9b8a23b69aefe5363e1eac087db646 Mon Sep 17 00:00:00 2001 From: Radim Marek Date: Fri, 4 Dec 2015 23:04:12 +0100 Subject: [PATCH] Added support magic characters in import pattern Import now allows to use the star wildcard, question mark and square brackets as used by filepath.Glob --- caddy/parse/parsing.go | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/caddy/parse/parsing.go b/caddy/parse/parsing.go index 03d9d800a..e71a03f5b 100644 --- a/caddy/parse/parsing.go +++ b/caddy/parse/parsing.go @@ -184,11 +184,26 @@ func (p *parser) doImport() error { if !p.NextArg() { return p.ArgErr() } - importFile := p.Val() + importPattern := p.Val() if p.NextArg() { return p.Err("Import allows only one file to import") } + matches, err := filepath.Glob(importPattern) + if err != nil { + return p.Errf("Failed to use import pattern %s - %s", importPattern, err.Error()) + } + + for _, importFile := range matches { + if err := p.doSingleImport(importFile); err != nil { + return err + } + } + + return nil +} + +func (p *parser) doSingleImport(importFile string) error { file, err := os.Open(importFile) if err != nil { return p.Errf("Could not import %s - %v", importFile, err)