summaryrefslogtreecommitdiffstats
path: root/src/main/distrib
diff options
context:
space:
mode:
authorFlorian Zschocke <florian.zschocke@devolo.de>2016-12-05 15:58:06 +0100
committerFlorian Zschocke <florian.zschocke@devolo.de>2016-12-06 15:36:53 +0100
commit1afeccc09bfaa885b5c01d3db29d42695b8290a1 (patch)
tree33a650272b9cfdbc92c3bdfc31763f39d6463061 /src/main/distrib
parent40040b656299bfafcaa92b12b916f93e8c5aed1d (diff)
downloadgitblit-1afeccc09bfaa885b5c01d3db29d42695b8290a1.tar.gz
gitblit-1afeccc09bfaa885b5c01d3db29d42695b8290a1.zip
Extend documentation in default.properties and LdapKeyManager.java.merged--sshLdapAuthenticator
Diffstat (limited to 'src/main/distrib')
-rw-r--r--src/main/distrib/data/defaults.properties6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/distrib/data/defaults.properties b/src/main/distrib/data/defaults.properties
index 1fe5b345..b9d77fe7 100644
--- a/src/main/distrib/data/defaults.properties
+++ b/src/main/distrib/data/defaults.properties
@@ -1938,7 +1938,11 @@ realm.ldap.uid = uid
# Attribute on the USER record that indicates their public SSH key.
# Leave blank when public SSH keys shall not be retrieved from LDAP.
#
-# This may be a simple attribute or an attribute and a value prefix. Examples:
+# This setting is only relevant when a public key manager is used that
+# retrieves SSH keys from LDAP (e.g. com.gitblit.transport.ssh.LdapKeyManager).
+#
+# The accepted format of the value is dependent on the public key manager used.
+# Examples:
# sshPublicKey - Use the attribute 'sshPublicKey' on the user record.
# altSecurityIdentities:SshKey - Use the attribute 'altSecurityIdentities'
# on the user record, for which the record value