Browse Source

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

master
Matthew Holt 5 years ago
parent
commit
3ba9e143a2
  1. 11
      cmd/main.go

11
cmd/main.go

@ -114,10 +114,17 @@ func loadConfig(configFile, adapterName string) ([]byte, error) {
cfgAdapter = caddyconfig.GetAdapter("caddyfile") cfgAdapter = caddyconfig.GetAdapter("caddyfile")
if cfgAdapter != nil { if cfgAdapter != nil {
config, err = ioutil.ReadFile("Caddyfile") 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) return nil, fmt.Errorf("reading default Caddyfile: %v", err)
} else {
// success reading default Caddyfile
configFile = "Caddyfile"
} }
configFile = "Caddyfile"
} }
} }

Loading…
Cancel
Save