Fix -port, -host, and -root flags when Caddyfile is missing

caddy/caddy.go

@@ -42,11 +42,6 @@ var (
 	// If true, initialization will not show any informative output.
 	Quiet bool
 
-	// DefaultInput is the default configuration to use when config input is empty or missing.
-	DefaultInput = CaddyfileInput{
-		Contents: []byte(fmt.Sprintf("%s:%s\nroot %s", DefaultHost, DefaultPort, DefaultRoot)),
-	}
-
 	// HTTP2 indicates whether HTTP2 is enabled or not
 	HTTP2 bool // TODO: temporary flag until http2 is standard
 )
@@ -297,7 +292,7 @@ func LoadCaddyfile(loader func() (Input, error)) (cdyfile Input, err error) {
 
 	// Otherwise revert to default
 	if cdyfile == nil {
-		cdyfile = DefaultInput
+		cdyfile = DefaultInput()
 	}
 
 	return

caddy/config.go

@@ -335,6 +335,14 @@ func NewDefault() server.Config {
 	}
 }
 
+// DefaultInput returns the default Caddyfile input
+// to use when it is otherwise empty or missing.
+func DefaultInput() CaddyfileInput {
+	return CaddyfileInput{
+		Contents: []byte(fmt.Sprintf("%s:%s\nroot %s", Host, Port, Root)),
+	}
+}
+
 // These defaults are configurable through the command line
 var (
 	// Site root

main.go

@@ -113,7 +113,7 @@ func loadCaddyfile() (caddy.Input, error) {
 	contents, err := ioutil.ReadFile(caddy.DefaultConfigFile)
 	if err != nil {
 		if os.IsNotExist(err) {
-			return caddy.DefaultInput, nil
+			return caddy.DefaultInput(), nil
 		}
 		return nil, err
 	}