diff options
| author | Florian Zschocke <fzs@users.noreply.github.com> | 2017-01-21 16:31:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-21 16:31:52 +0100 |
| commit | 52869d49e6901dd74f740ccc24fb5d81a7deae20 (patch) | |
| tree | 2510706e5703142bee44a712d4d62e3ceae091d2 /src/main/distrib/data | |
| parent | d0d62788e3865db025b2636883988c6067fb59f8 (diff) | |
| parent | 51e70f4233400ccf90c4e05638df53f2d5784d3c (diff) | |
| download | gitblit-52869d49e6901dd74f740ccc24fb5d81a7deae20.tar.gz gitblit-52869d49e6901dd74f740ccc24fb5d81a7deae20.zip | |
Merge pull request #6 from fzs/sshAuthMethods
Set list of offered SSH authentication methods.
Diffstat (limited to 'src/main/distrib/data')
| -rw-r--r-- | src/main/distrib/data/defaults.properties | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/src/main/distrib/data/defaults.properties b/src/main/distrib/data/defaults.properties index 9bb02482..51fa1253 100644 --- a/src/main/distrib/data/defaults.properties +++ b/src/main/distrib/data/defaults.properties @@ -138,10 +138,25 @@ git.sshKeysManager = com.gitblit.transport.ssh.FileKeyManager # SINCE 1.5.0 git.sshKeysFolder= ${baseFolder}/ssh -# Use Kerberos5 (GSS) authentication + +# Authentication methods offered by the SSH server. +# Space separated list of authentication method names that the +# server shall offer. The default is "publickey password". # -# SINCE 1.7.0 -git.sshWithKrb5 = false +# Valid authentication method names are: +# publickey - authenticate with SSH public key +# password - authenticate with username, password +# keyboard-interactive - currently synonym to 'password' +# gssapi-with-mic - GSS API Kerberos 5 authentication +# +# This setting obsoletes the "git.sshWithKrb5" setting. To enable +# Kerberos5 (GSS) authentication, add 'gssapi-with-mic' to the list. +# +# SINCE 1.9.0 +# RESTART REQUIRED +# SPACE-DELIMITED +git.sshAuthenticationMethods = publickey password + # The path to a Kerberos 5 keytab. # |