From e9515425e0b13d9da15970e282db110bf7dadae9 Mon Sep 17 00:00:00 2001 From: Whitestrake Date: Wed, 17 Jan 2018 04:37:49 +1000 Subject: [PATCH] use import to handle globbed values for -conf flag (#1973) --- caddy/caddymain/run.go | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/caddy/caddymain/run.go b/caddy/caddymain/run.go index 82087d8ff..e6faa0513 100644 --- a/caddy/caddymain/run.go +++ b/caddy/caddymain/run.go @@ -170,10 +170,18 @@ func confLoader(serverType string) (caddy.Input, error) { return caddy.CaddyfileFromPipe(os.Stdin, serverType) } - contents, err := ioutil.ReadFile(conf) - if err != nil { - return nil, err + var contents []byte + if strings.Contains(conf, "*") { + // Let caddyfile.doImport logic handle the globbed path + contents = []byte("import " + conf) + } else { + var err error + contents, err = ioutil.ReadFile(conf) + if err != nil { + return nil, err + } } + return caddy.CaddyfileInput{ Contents: contents, Filepath: conf,