From 00bfa1d0552c844ba9f2060b24a21d83785c2ff5 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 13 Dec 2017 16:57:28 +0800 Subject: [PATCH] fix run web with -p push failed (#3154) --- cmd/web.go | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/cmd/web.go b/cmd/web.go index 811771aa5b..55546ea480 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -19,8 +19,10 @@ import ( "code.gitea.io/gitea/routers" "code.gitea.io/gitea/routers/routes" + "github.com/Unknwon/com" context2 "github.com/gorilla/context" "github.com/urfave/cli" + ini "gopkg.in/ini.v1" ) // CmdWeb represents the available web sub-command. @@ -69,6 +71,34 @@ func runWeb(ctx *cli.Context) error { if ctx.IsSet("port") { setting.AppURL = strings.Replace(setting.AppURL, setting.HTTPPort, ctx.String("port"), 1) setting.HTTPPort = ctx.String("port") + + switch setting.Protocol { + case setting.UnixSocket: + case setting.FCGI: + default: + // Save LOCAL_ROOT_URL if port changed + cfg := ini.Empty() + if com.IsFile(setting.CustomConf) { + // Keeps custom settings if there is already something. + if err := cfg.Append(setting.CustomConf); err != nil { + return fmt.Errorf("Failed to load custom conf '%s': %v", setting.CustomConf, err) + } + } + + defaultLocalURL := string(setting.Protocol) + "://" + if setting.HTTPAddr == "0.0.0.0" { + defaultLocalURL += "localhost" + } else { + defaultLocalURL += setting.HTTPAddr + } + defaultLocalURL += ":" + setting.HTTPPort + "/" + + cfg.Section("server").Key("LOCAL_ROOT_URL").SetValue(defaultLocalURL) + + if err := cfg.SaveTo(setting.CustomConf); err != nil { + return fmt.Errorf("Error saving generated JWT Secret to custom config: %v", err) + } + } } var listenAddr string