Browse Source
Merge remote-tracking branch 'origin/master'
master
Matthew Holt
4 years ago
No known key found for this signature in database
GPG Key ID: 2A349DD577D586A5
1 changed files with
5 additions and
1 deletions
-
cmd/main.go
|
|
@ -123,7 +123,11 @@ func loadConfig(configFile, adapterName string) ([]byte, string, error) { |
|
|
|
var cfgAdapter caddyconfig.Adapter |
|
|
|
var err error |
|
|
|
if 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) |
|
|
|
} |
|
|
|