From 5485da49b04bb139d28d42fe8f3d371915e79a3d Mon Sep 17 00:00:00 2001
From: Fabrice Bacchella <fbacchella@spamcop.net>
Date: Mon, 04 May 2015 05:52:12 -0400
Subject: [PATCH] Adding Kerberos5/GSS authentication to ssh Adding the possibility to define authentication method order for ssh
---
src/main/distrib/data/defaults.properties | 47 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/src/main/distrib/data/defaults.properties b/src/main/distrib/data/defaults.properties
index 14b3f63..ee97cb6 100644
--- a/src/main/distrib/data/defaults.properties
+++ b/src/main/distrib/data/defaults.properties
@@ -126,6 +126,28 @@
# 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.
@@ -571,6 +593,21 @@
#
# SINCE 1.5.0
plugins.registry = http://plugins.gitblit.com/plugins.json
+
+# The HTTP proxy host for plugin manager.
+#
+# SINCE 1.7.0
+plugins.httpProxyHost =
+
+# The HTTP proxy port for plugin manager.
+#
+# SINCE 1.7.0
+plugins.httpProxyPort =
+
+# The HTTP proxy authorization header for plugin manager.
+#
+# SINCE 1.7.0
+plugins.httpProxyAuthorization =
# Number of threads used to handle miscellaneous tasks in the background.
#
@@ -1171,7 +1208,7 @@
web.showSearchTypeSelection = false
# Controls display of activity graphs on the dashboard, activity, and summary
-# pages. Charting makes use of the external Google Charts API.
+# pages. Charts are generated using Flotr2; an open source HTML5 library.
#
# SINCE 0.5.0
web.generateActivityGraph = true
@@ -1276,7 +1313,7 @@
#
# SPACE-DELIMITED
# SINCE 0.5.0
-web.prettyPrintExtensions = aea agc basic c cbm cl clj cpp cs css dart el erl erlang frm fs go groovy h hpp hs htm html java js latex lisp ll llvm lsp lua ml moxie mumps n nemerle pascal php pl pm prefs properties proto py r R rb rd Rd rkt s S scala scm sh Splus sql ss tcl tex vb vbs vhd vhdl wiki xml xq xquery yaml yml ymlapollo
+web.prettyPrintExtensions = aea agc basic bat c cbm cl clj cmd cpp cs css dart el erl erlang frm fs go groovy h hpp hs htm html java js latex lisp ll llvm lsp lua ml moxie mumps n nemerle pascal php pl pm prefs properties proto py r R rb rd Rd rkt s S scala scm sh Splus sql ss tcl tex vb vbs vhd vhdl wiki xml xq xquery yaml yml ymlapollo
# Registered extensions for markdown transformation
#
@@ -1344,6 +1381,12 @@
# RESTART REQUIRED
web.debugMode = false
+# Allows to hide the user logon form or dropdown menu from the top pane
+# if it's not needed.
+#
+# SINCE 1.7.0
+web.displayUserPanel = true
+
# Force a default locale for all users, ignoring the browser's settings.
# An empty value allows Gitblit to use the translation preferred by the browser.
#
--
Gitblit v1.9.1