From afc9deedc7da2b5a3d183941d63e13bfbfb7c78a Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gmail.com>
Date: Wed, 09 Dec 2015 19:36:39 -0500
Subject: [PATCH] Merge pull request #983 from mrjoel/mrjoel-dotfiledetection
---
src/main/distrib/data/defaults.properties | 48 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 38 insertions(+), 10 deletions(-)
diff --git a/src/main/distrib/data/defaults.properties b/src/main/distrib/data/defaults.properties
index 60c914b..ce6267a 100644
--- a/src/main/distrib/data/defaults.properties
+++ b/src/main/distrib/data/defaults.properties
@@ -138,27 +138,27 @@
# SINCE 1.5.0
git.sshKeysFolder= ${baseFolder}/ssh
-# Use kerberos5 (GSS) authentication
+# Use Kerberos5 (GSS) authentication
#
# SINCE 1.7.0
-git.sshWithKrb5 = "false"
+git.sshWithKrb5 = false
-# The path to a kerberos 5 keytab.
+# The path to a Kerberos 5 keytab.
#
# SINCE 1.7.0
-git.sshKrb5Keytab = ""
+git.sshKrb5Keytab =
-# The service principal name to be used for Kerberos5. The default is host/hostname.
+# The service principal name to be used for Kerberos5.
+# The default is host/hostname.
#
# SINCE 1.7.0
-git.sshKrb5ServicePrincipalName = ""
+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"
+# Strip the domain suffix from a kerberos username.
+# e.g. james@bigbox would be "james"
#
# SINCE 1.7.0
-git.sshAuthenticatorsOrder = "password,keyboard-interactive,publickey"
+git.sshKrb5StripDomain = true
# SSH backend NIO2|MINA.
#
@@ -1203,6 +1203,20 @@
# SINCE 1.7.0
web.showSshDaemonUrls = true
+# Should effective permissions be advertised for access paths defined in web.otherUrls?
+# If false, gitblit will indicate unknown permissions for the external link. If true,
+# gitblit will indicate permissions as defined within gitblit (including limiting to clone
+# permission is the transport type is not a valid push mechaism in git.acceptedPushTransports).
+#
+# Configure with caution: Note that gitblit has no way of knowing if further restrictions
+# are imposed by an external forwarding agent, so this may cause user confusion due to
+# more rights being advertised than are available through the URL. It will NOT grant
+# additional rights, but may incorrectly offer actions that are unavailable externally.
+# default: false
+#
+# SINCE 1.7.0
+web.advertiseAccessPermissionForOtherUrls = false
+
# Should app-specific clone links be displayed for SourceTree, SparkleShare, etc?
#
# SINCE 1.3.0
@@ -2016,3 +2030,17 @@
# SINCE 0.5.0
# RESTART REQUIRED
server.shutdownPort = 8081
+
+#
+# Gitblit Filestore Settings
+#
+# The location to save the filestore blobs
+#
+# SINCE 1.7.0
+filestore.storageFolder = ${baseFolder}/lfs
+
+# Maximum allowable upload size
+# The default value, -1, disables upload limits.
+# Common unit suffixes of k, m, or g are supported.
+# SINCE 1.7.0
+filestore.maxUploadSize = -1
--
Gitblit v1.9.1