diff options
| author | Unknwon <u@gogs.io> | 2016-02-27 20:48:39 -0500 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2016-02-27 20:48:39 -0500 |
| commit | 8055a0bdac005189077df69870cd2ed0b7eebd56 (patch) | |
| tree | bf3fa2bf419006ea846315eef48fb5e83378376c /routers | |
| parent | 83c74878df3f6edec4fca51e9cec299d2a1bb897 (diff) | |
| download | gitea-8055a0bdac005189077df69870cd2ed0b7eebd56.tar.gz gitea-8055a0bdac005189077df69870cd2ed0b7eebd56.zip | |
Post work for #2637
Improve test cases, config settings, also show SSH config settings on admin config panel.
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/admin/admin.go | 2 | ||||
| -rw-r--r-- | routers/install.go | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/routers/admin/admin.go b/routers/admin/admin.go index db86abb84a..876a048de1 100644 --- a/routers/admin/admin.go +++ b/routers/admin/admin.go @@ -204,6 +204,8 @@ func Config(ctx *middleware.Context) { ctx.Data["ScriptType"] = setting.ScriptType ctx.Data["ReverseProxyAuthUser"] = setting.ReverseProxyAuthUser + ctx.Data["SSH"] = setting.SSH + ctx.Data["Service"] = setting.Service ctx.Data["DbCfg"] = models.DbCfg ctx.Data["Webhook"] = setting.Webhook diff --git a/routers/install.go b/routers/install.go index b2c1d6ea01..844f48bd04 100644 --- a/routers/install.go +++ b/routers/install.go @@ -88,9 +88,9 @@ func GlobalInit() { } checkRunMode() - if setting.StartSSHServer { - ssh.Listen(setting.SSHListenPort) - log.Info("SSH server started on :%v", setting.SSHListenPort) + if setting.SSH.StartBuiltinServer { + ssh.Listen(setting.SSH.ListenPort) + log.Info("SSH server started on :%v", setting.SSH.ListenPort) } // Build Sanitizer @@ -152,7 +152,7 @@ func Install(ctx *middleware.Context) { } form.Domain = setting.Domain - form.SSHPort = setting.SSHPort + form.SSHPort = setting.SSH.Port form.HTTPPort = setting.HttpPort form.AppUrl = setting.AppUrl form.LogRootPath = setting.LogRootPath |