mirror of
https://github.com/caddyserver/caddy.git
synced 2025-05-22 17:49:59 +08:00
Pipe and -conf flag together are an error (#315)
This commit is contained in:
13
main.go
13
main.go
@ -117,6 +117,19 @@ func mustLogFatal(args ...interface{}) {
|
||||
}
|
||||
|
||||
func loadCaddyfile() (caddy.Input, error) {
|
||||
// First try stdin pipe
|
||||
cdyfile, err := caddy.CaddyfileFromPipe(os.Stdin)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if cdyfile != nil {
|
||||
// it is an error if -conf is also specified because, which to use?
|
||||
if conf != "" {
|
||||
return nil, errors.New("load: can't choose between stdin pipe and -conf flag")
|
||||
}
|
||||
return cdyfile, err
|
||||
}
|
||||
|
||||
// -conf flag
|
||||
if conf != "" {
|
||||
contents, err := ioutil.ReadFile(conf)
|
||||
|
Reference in New Issue
Block a user