mirror of
https://github.com/caddyserver/caddy.git
synced 2024-12-23 22:27:38 -05:00
Caddyfiles read from STDIN now have server types associated with them. Fixes #1090.
This commit is contained in:
parent
a122304196
commit
635714fe38
2 changed files with 5 additions and 4 deletions
7
caddy.go
7
caddy.go
|
@ -388,7 +388,7 @@ func (i *Instance) Wait() {
|
|||
// but the Input value will be nil. An error is only returned
|
||||
// if there was an error reading the pipe, even if the length
|
||||
// of what was read is 0.
|
||||
func CaddyfileFromPipe(f *os.File) (Input, error) {
|
||||
func CaddyfileFromPipe(f *os.File, serverType string) (Input, error) {
|
||||
fi, err := f.Stat()
|
||||
if err == nil && fi.Mode()&os.ModeCharDevice == 0 {
|
||||
// Note that a non-nil error is not a problem. Windows
|
||||
|
@ -402,8 +402,9 @@ func CaddyfileFromPipe(f *os.File) (Input, error) {
|
|||
return nil, err
|
||||
}
|
||||
return CaddyfileInput{
|
||||
Contents: confBody,
|
||||
Filepath: f.Name(),
|
||||
Contents: confBody,
|
||||
Filepath: f.Name(),
|
||||
ServerTypeName: serverType,
|
||||
}, nil
|
||||
}
|
||||
|
||||
|
|
|
@ -136,7 +136,7 @@ func confLoader(serverType string) (caddy.Input, error) {
|
|||
}
|
||||
|
||||
if conf == "stdin" {
|
||||
return caddy.CaddyfileFromPipe(os.Stdin)
|
||||
return caddy.CaddyfileFromPipe(os.Stdin, serverType)
|
||||
}
|
||||
|
||||
contents, err := ioutil.ReadFile(conf)
|
||||
|
|
Loading…
Reference in a new issue