summaryrefslogtreecommitdiffstats
path: root/src/main/distrib/data
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2015-05-21 19:24:22 -0600
committerJames Moger <james.moger@gitblit.com>2015-05-21 19:24:22 -0600
commitbcb1beeadeef4745dd204ea0626aa95433612c56 (patch)
treedef6db66fb0d6c66d2745dbce66d00fcd58b150e /src/main/distrib/data
parent9731bd4731729c29c2a7be208275131b4e69940e (diff)
parent5485da49b04bb139d28d42fe8f3d371915e79a3d (diff)
downloadgitblit-bcb1beeadeef4745dd204ea0626aa95433612c56.tar.gz
gitblit-bcb1beeadeef4745dd204ea0626aa95433612c56.zip
Merged #247 "Add Kerberos5/GSS authentication to ssh"
Diffstat (limited to 'src/main/distrib/data')
-rw-r--r--src/main/distrib/data/defaults.properties22
1 files changed, 22 insertions, 0 deletions
diff --git a/src/main/distrib/data/defaults.properties b/src/main/distrib/data/defaults.properties
index 7be50c80..59fa3996 100644
--- a/src/main/distrib/data/defaults.properties
+++ b/src/main/distrib/data/defaults.properties
@@ -126,6 +126,28 @@ git.sshKeysManager = com.gitblit.transport.ssh.FileKeyManager
# SINCE 1.5.0
git.sshKeysFolder= ${baseFolder}/ssh
+# Use kerberos5 (GSS) authentication
+#
+# SINCE 1.7.0
+git.sshWithKrb5 = "false"
+
+# The path to a kerberos 5 keytab.
+#
+# SINCE 1.7.0
+git.sshKrb5Keytab = ""
+
+# The service principal name to be used for Kerberos5. The default is host/hostname.
+#
+# SINCE 1.7.0
+git.sshKrb5ServicePrincipalName = ""
+
+# A comma-separated list of authentication method. They will be tried in
+# the given order. Possible values are
+# "gssapi-with-mic", "publickey", "keyboard-interactive" or "password"
+#
+# SINCE 1.7.0
+git.sshAuthenticatorsOrder = "password,keyboard-interactive,publickey"
+
# SSH backend NIO2|MINA.
#
# The Apache Mina project recommends using the NIO2 backend.