summaryrefslogtreecommitdiffstats
path: root/conf
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 /conf
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 'conf')
-rw-r--r--conf/app.ini3
1 files changed, 3 insertions, 0 deletions
diff --git a/conf/app.ini b/conf/app.ini
index 6524486b82..3b1bccf816 100644
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -125,6 +125,9 @@ SSH_PORT = 22
SSH_LISTEN_PORT = %(SSH_PORT)s
; Root path of SSH directory, default is '~/.ssh', but you have to use '/home/git/.ssh'.
SSH_ROOT_PATH =
+; For built-in SSH server only, choose the ciphers to support for SSH connections,
+; for system SSH this setting has no effect
+SSH_SERVER_CIPHERS = aes128-ctr, aes192-ctr, aes256-ctr, aes128-gcm@openssh.com, arcfour256, arcfour128
; Directory to create temporary files when test public key using ssh-keygen,
; default is system temporary directory.
SSH_KEY_TEST_PATH =