summaryrefslogtreecommitdiffstats
path: root/routers/init.go
diff options
context:
space:
mode:
authorspacetourist <guy.callum@gmail.com>2017-10-21 14:13:41 +0100
committerLauris BH <lauris@nix.lv>2017-10-21 16:13:41 +0300
commit7131c7d40d4f5bd32b16031e884153548eee133f (patch)
tree99fa77ac1d785be873ddb0c955f6eeab828baaee /routers/init.go
parent985a39590ba07798dd6e6097e0c10401764c27fb (diff)
downloadgitea-7131c7d40d4f5bd32b16031e884153548eee133f.tar.gz
gitea-7131c7d40d4f5bd32b16031e884153548eee133f.zip
Configurable SSH cipher suite (#913)
* Configurable SSH cipher suite * Update configuration file comment * Add default in settings loading code * Fix fmt and log messsage * Remove default from code as this could probably might not be good idea
Diffstat (limited to 'routers/init.go')
-rw-r--r--routers/init.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/routers/init.go b/routers/init.go
index d04ffea4c1..006f285266 100644
--- a/routers/init.go
+++ b/routers/init.go
@@ -77,7 +77,7 @@ func GlobalInit() {
checkRunMode()
if setting.InstallLock && setting.SSH.StartBuiltinServer {
- ssh.Listen(setting.SSH.ListenHost, setting.SSH.ListenPort)
- log.Info("SSH server started on %s:%v", setting.SSH.ListenHost, setting.SSH.ListenPort)
+ ssh.Listen(setting.SSH.ListenHost, setting.SSH.ListenPort, setting.SSH.ServerCiphers)
+ log.Info("SSH server started on %s:%d. Cipher list (%v)", setting.SSH.ListenHost, setting.SSH.ListenPort, setting.SSH.ServerCiphers)
}
}