Browse Source

Merge remote-tracking branch 'origin/master'

master
Matthew Holt 4 years ago
parent
commit
bac82073d0
No known key found for this signature in database GPG Key ID: 2A349DD577D586A5
  1. 6
      cmd/main.go

6
cmd/main.go

@ -123,7 +123,11 @@ func loadConfig(configFile, adapterName string) ([]byte, string, error) {
var cfgAdapter caddyconfig.Adapter
var err error
if configFile != "" {
config, err = ioutil.ReadFile(configFile)
if configFile == "-" {
config, err = ioutil.ReadAll(os.Stdin)
} else {
config, err = ioutil.ReadFile(configFile)
}
if err != nil {
return nil, "", fmt.Errorf("reading config file: %v", err)
}

Loading…
Cancel
Save