mirror of
				https://github.com/go-gitea/gitea
				synced 2025-11-03 21:08:25 +00:00 
			
		
		
		
	fix run web with -p push failed (#3154)
This commit is contained in:
		
							
								
								
									
										30
									
								
								cmd/web.go
									
									
									
									
									
								
							
							
						
						
									
										30
									
								
								cmd/web.go
									
									
									
									
									
								
							@@ -19,8 +19,10 @@ import (
 | 
				
			|||||||
	"code.gitea.io/gitea/routers"
 | 
						"code.gitea.io/gitea/routers"
 | 
				
			||||||
	"code.gitea.io/gitea/routers/routes"
 | 
						"code.gitea.io/gitea/routers/routes"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						"github.com/Unknwon/com"
 | 
				
			||||||
	context2 "github.com/gorilla/context"
 | 
						context2 "github.com/gorilla/context"
 | 
				
			||||||
	"github.com/urfave/cli"
 | 
						"github.com/urfave/cli"
 | 
				
			||||||
 | 
						ini "gopkg.in/ini.v1"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// CmdWeb represents the available web sub-command.
 | 
					// CmdWeb represents the available web sub-command.
 | 
				
			||||||
@@ -69,6 +71,34 @@ func runWeb(ctx *cli.Context) error {
 | 
				
			|||||||
	if ctx.IsSet("port") {
 | 
						if ctx.IsSet("port") {
 | 
				
			||||||
		setting.AppURL = strings.Replace(setting.AppURL, setting.HTTPPort, ctx.String("port"), 1)
 | 
							setting.AppURL = strings.Replace(setting.AppURL, setting.HTTPPort, ctx.String("port"), 1)
 | 
				
			||||||
		setting.HTTPPort = ctx.String("port")
 | 
							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
 | 
						var listenAddr string
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user