mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-11-04 04:14:01 +01:00 
			
		
		
		
	Fix wrong place to check disable SSH
This commit is contained in:
		
							parent
							
								
									6e74dd4388
								
							
						
					
					
						commit
						c9516c4c60
					
				@ -1,6 +1,7 @@
 | 
			
		||||
[run]
 | 
			
		||||
init_cmds = [
 | 
			
		||||
	#["grep", "-rn", "FIXME", "."],
 | 
			
		||||
	["make", "build-dev"],
 | 
			
		||||
	["./gogs", "web"]
 | 
			
		||||
]
 | 
			
		||||
watch_all = true
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										11
									
								
								cmd/serve.go
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								cmd/serve.go
									
									
									
									
									
								
							@ -42,11 +42,6 @@ func setup(logPath string) {
 | 
			
		||||
	setting.NewContext()
 | 
			
		||||
	log.NewGitLogger(filepath.Join(setting.LogRootPath, logPath))
 | 
			
		||||
 | 
			
		||||
	if setting.DisableSSH {
 | 
			
		||||
		println("Gogs: SSH has been disabled")
 | 
			
		||||
		os.Exit(1)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	models.LoadConfigs()
 | 
			
		||||
 | 
			
		||||
	if setting.UseSQLite3 || setting.UseTiDB {
 | 
			
		||||
@ -138,8 +133,14 @@ func runServ(c *cli.Context) {
 | 
			
		||||
	if c.IsSet("config") {
 | 
			
		||||
		setting.CustomConf = c.String("config")
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	setup("serv.log")
 | 
			
		||||
 | 
			
		||||
	if setting.DisableSSH {
 | 
			
		||||
		println("Gogs: SSH has been disabled")
 | 
			
		||||
		return
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if len(c.Args()) < 1 {
 | 
			
		||||
		fail("Not enough arguments", "Not enough arguments")
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
@ -16,7 +16,7 @@ import (
 | 
			
		||||
 | 
			
		||||
var CmdUpdate = cli.Command{
 | 
			
		||||
	Name:        "update",
 | 
			
		||||
	Usage:       "This command should only be called by SSH shell",
 | 
			
		||||
	Usage:       "This command should only be called by Git hook",
 | 
			
		||||
	Description: `Update get pushed info and insert into database`,
 | 
			
		||||
	Action:      runUpdate,
 | 
			
		||||
	Flags: []cli.Flag{
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										2
									
								
								gogs.go
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								gogs.go
									
									
									
									
									
								
							@ -17,7 +17,7 @@ import (
 | 
			
		||||
	"github.com/gogits/gogs/modules/setting"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
const APP_VER = "0.8.41.0220"
 | 
			
		||||
const APP_VER = "0.8.41.0221"
 | 
			
		||||
 | 
			
		||||
func init() {
 | 
			
		||||
	runtime.GOMAXPROCS(runtime.NumCPU())
 | 
			
		||||
 | 
			
		||||
@ -1 +1 @@
 | 
			
		||||
0.8.41.0220
 | 
			
		||||
0.8.41.0221
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user