From 2b412d4ac7fb143addf2bf5139de7ee903525b24 Mon Sep 17 00:00:00 2001 From: Marcelo Glezer Date: Fri, 17 Oct 2014 13:32:16 -0300 Subject: [PATCH] fixed server reporting Web Server is available at https://localhost:1313 when server always serve http --- commands/server.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/commands/server.go b/commands/server.go index 6b62dca70..921b9fbdb 100644 --- a/commands/server.go +++ b/commands/server.go @@ -110,8 +110,6 @@ func server(cmd *cobra.Command, args []string) { func serve(port int) { jww.FEEDBACK.Println("Serving pages from " + helpers.AbsPathify(viper.GetString("PublishDir"))) - jww.FEEDBACK.Printf("Web Server is available at %s\n", viper.GetString("BaseUrl")) - fmt.Println("Press ctrl+c to stop") httpFs := &afero.HttpFs{SourceFs: hugofs.DestinationFS} fileserver := http.FileServer(httpFs.Dir(helpers.AbsPathify(viper.GetString("PublishDir")))) @@ -126,6 +124,10 @@ func serve(port int) { http.Handle(u.Path+"/", http.StripPrefix(u.Path+"/", fileserver)) } + u.Scheme = "http" + jww.FEEDBACK.Printf("Web Server is available at %s\n", u.String()) + fmt.Println("Press ctrl+c to stop") + err = http.ListenAndServe(":"+strconv.Itoa(port), nil) if err != nil { jww.ERROR.Printf("Error: %s\n", err.Error())