Infrastructure/caddy
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-23 22:27:38 -05:00
Code Issues Activity

Merge pull request #1091 from mikepulaski/master

Browse source 
Caddyfiles read from STDIN now have server types associated with them.
This commit is contained in:
Matt Holt 2016-09-05 13:14:35 -06:00 committed by GitHub
commit 1ea96def31
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
caddy.go
View file

@ -388,7 +388,7 @@ func (i *Instance) Wait() {
// but the Input value will be nil. An error is only returned // but the Input value will be nil. An error is only returned
// if there was an error reading the pipe, even if the length // if there was an error reading the pipe, even if the length
// of what was read is 0. // 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() fi, err := f.Stat()
if err == nil && fi.Mode()&os.ModeCharDevice == 0 { if err == nil && fi.Mode()&os.ModeCharDevice == 0 {
// Note that a non-nil error is not a problem. Windows // 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 nil, err
} }
return CaddyfileInput{ return CaddyfileInput{
Contents: confBody, Contents: confBody,
Filepath: f.Name(), Filepath: f.Name(),
ServerTypeName: serverType,
}, nil }, nil
} }

2
caddy/caddymain/run.go
View file

@ -136,7 +136,7 @@ func confLoader(serverType string) (caddy.Input, error) {
} }
if conf == "stdin" { if conf == "stdin" {
return caddy.CaddyfileFromPipe(os.Stdin) return caddy.CaddyfileFromPipe(os.Stdin, serverType)
} }
contents, err := ioutil.ReadFile(conf) contents, err := ioutil.ReadFile(conf)