From be49ef9b1b2ab0ee251085efd5930b6f99bbced9 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 05 Oct 2015 08:09:53 -0400
Subject: [PATCH] Address review comments

---
 src/main/distrib/data/defaults.properties |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/main/distrib/data/defaults.properties b/src/main/distrib/data/defaults.properties
index 272eec0..5db6883 100644
--- a/src/main/distrib/data/defaults.properties
+++ b/src/main/distrib/data/defaults.properties
@@ -116,13 +116,13 @@
 # This may be useful in complex forwarding setups.
 #
 # SINCE 1.7.0
-git.sshDisplayHost = 
+git.sshAdvertisedHost = 
 
 # Manually specify the port to use in advertised SSH repository urls.
 # This may be useful in complex forwarding setups.
 #
 # SINCE 1.7.0
-git.sshDisplayPort = 
+git.sshAdvertisedPort = 
 
 # Specify the SSH key manager to use for retrieving, storing, and removing
 # SSH keys.
@@ -147,6 +147,12 @@
 #
 # SINCE 1.7.0
 git.sshKrb5Keytab = ""
+
+# Strip the domain suffix from a kerberos username.
+# e.g. james@bigbox would be "james"
+#
+# SINCE 1.7.0
+git.sshKrb5StripDomain = true
 
 # The service principal name to be used for Kerberos5.  The default is host/hostname.
 #
@@ -1203,6 +1209,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

--
Gitblit v1.9.1