cli: Fix run and start when no config file is available

This commit is contained in:
Matthew Holt 2019-09-05 14:58:07 -06:00
parent 50961ecc77
commit 3ba9e143a2

View File

@ -114,10 +114,17 @@ func loadConfig(configFile, adapterName string) ([]byte, error) {
cfgAdapter = caddyconfig.GetAdapter("caddyfile")
if cfgAdapter != nil {
config, err = ioutil.ReadFile("Caddyfile")
if err != nil && !os.IsNotExist(err) {
if os.IsNotExist(err) {
// okay, no default Caddyfile; pretend like this never happened
cfgAdapter = nil
err = nil
} else if err != nil {
// default Caddyfile exists, but error reading it
return nil, fmt.Errorf("reading default Caddyfile: %v", err)
} else {
// success reading default Caddyfile
configFile = "Caddyfile"
}
configFile = "Caddyfile"
}
}