Merge pull request #1091 from mikepulaski/master

Caddyfiles read from STDIN now have server types associated with them.

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
@@ -404,6 +404,7 @@ func CaddyfileFromPipe(f *os.File) (Input, error) {
 		return CaddyfileInput{
 			Contents:       confBody,
 			Filepath:       f.Name(),
+			ServerTypeName: serverType,
 		}, nil
 	}
 

caddy/caddymain/run.go

@@ -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)