From 65c060f56e2e2d3a94580d938d8373f736821d83 Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Fri, 4 Oct 2019 17:30:51 -0600 Subject: file_server: Set default address to :2015 if --listen not specified --- modules/caddyhttp/fileserver/command.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'modules') diff --git a/modules/caddyhttp/fileserver/command.go b/modules/caddyhttp/fileserver/command.go index 727d7ba..ac580b6 100644 --- a/modules/caddyhttp/fileserver/command.go +++ b/modules/caddyhttp/fileserver/command.go @@ -21,6 +21,7 @@ import ( "github.com/caddyserver/caddy/v2" "github.com/caddyserver/caddy/v2/caddyconfig" + "github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile" caddycmd "github.com/caddyserver/caddy/v2/cmd" "github.com/caddyserver/caddy/v2/modules/caddyhttp" ) @@ -81,9 +82,10 @@ func cmdFileServer(fs caddycmd.Flags) (int, error) { server := &caddyhttp.Server{ Routes: caddyhttp.RouteList{route}, } - if listen != "" { - server.Listen = []string{listen} + if listen == "" { + listen = ":" + httpcaddyfile.DefaultPort } + server.Listen = []string{listen} httpApp := caddyhttp.App{ Servers: map[string]*caddyhttp.Server{"static": server}, @@ -100,7 +102,7 @@ func cmdFileServer(fs caddycmd.Flags) (int, error) { return caddy.ExitCodeFailedStartup, err } - log.Println("Caddy 2 serving static files") + log.Printf("Caddy 2 serving static files on %s", listen) select {} } -- cgit v1.2.3