diff options
| author | James Moger <james.moger@gitblit.com> | 2014-02-19 09:57:44 -0500 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-02-19 11:05:48 -0500 |
| commit | 6659fa5151ebd5fb744b7b07f929e580ce6f5843 (patch) | |
| tree | ace639938a62bf702045ed55ab6681fe52a15a63 /src/main/distrib/data | |
| parent | 03c0191b65c68dc6be3da0e0056bcb3cbc6e9cef (diff) | |
| download | gitblit-6659fa5151ebd5fb744b7b07f929e580ce6f5843.tar.gz gitblit-6659fa5151ebd5fb744b7b07f929e580ce6f5843.zip | |
API adjustments and elimination of duplicate config options
Diffstat (limited to 'src/main/distrib/data')
| -rw-r--r-- | src/main/distrib/data/gitblit.properties | 44 |
1 files changed, 21 insertions, 23 deletions
diff --git a/src/main/distrib/data/gitblit.properties b/src/main/distrib/data/gitblit.properties index 6168f417..da638322 100644 --- a/src/main/distrib/data/gitblit.properties +++ b/src/main/distrib/data/gitblit.properties @@ -1465,7 +1465,7 @@ realm.ldap.groupMemberPattern = (&(objectClass=group)(member=${dn})) # Query pattern to use when searching for an empty team. This may be any valid
# LDAP query expression, including the standard (&) and (|) operators.
#
-#default: (&(objectClass=group)(!(member=*)))
+# default: (&(objectClass=group)(!(member=*)))
# SINCE 1.4.0
realm.ldap.groupEmptyMemberPattern = (&(objectClass=group)(!(member=*)))
@@ -1502,46 +1502,44 @@ realm.ldap.displayName = displayName # SINCE 1.0.0
realm.ldap.email = email
-# Defines the cache period to be used when caching LDAP queries. This is currently
-# only used for LDAP user synchronization.
-#
-# Must be of the form '<long> <TimeUnit>' where <TimeUnit> is one of 'MILLISECONDS', 'SECONDS', 'MINUTES', 'HOURS', 'DAYS'
-# default: 2 MINUTES
+# Attribute on the USER record that indicate their username to be used in gitblit
+# when synchronizing users from LDAP
+# if blank, Gitblit will use uid
+# For MS Active Directory this may be sAMAccountName
#
-# RESTART REQUIRED
-realm.ldap.ldapCachePeriod = 2 MINUTES
+# SINCE 1.0.0
+realm.ldap.uid = uid
-# Defines whether to synchronize all LDAP users into the backing user service
+# Defines whether to synchronize all LDAP users and teams into the user service
#
# Valid values: true, false
# If left blank, false is assumed
-realm.ldap.synchronizeUsers.enable = false
+#
+# SINCE 1.4.0
+realm.ldap.synchronize = false
-# Defines the period to be used when synchronizing users from ldap. This is currently
-# only used for LDAP user synchronization.
+# Defines the period to be used when synchronizing users and teams from ldap.
#
# Must be of the form '<long> <TimeUnit>' where <TimeUnit> is one of 'MILLISECONDS', 'SECONDS', 'MINUTES', 'HOURS', 'DAYS'
-# <long> is at least the value from realm.ldap.ldapCachePeriod if lower the value from realm.ldap.ldapCachePeriod is used.
+
# default: 5 MINUTES
#
# RESTART REQUIRED
# SINCE 1.4.0
-realm.ldap.synchronizeUsers.ldapSyncPeriod = 5 MINUTES
+realm.ldap.syncPeriod = 5 MINUTES
-# Defines whether to delete non-existent LDAP users from the backing user service
-# during synchronization. depends on realm.ldap.synchronizeUsers.enable = true
+# Defines whether to delete non-existent LDAP users from the user service
+# during synchronization. depends on realm.ldap.synchronize = true
#
# Valid values: true, false
# If left blank, true is assumed
-realm.ldap.synchronizeUsers.removeDeleted = true
-
-# Attribute on the USER record that indicate their username to be used in gitblit
-# when synchronizing users from LDAP
-# if blank, Gitblit will use uid
-# For MS Active Directory this may be sAMAccountName
-realm.ldap.uid = uid
+#
+# SINCE 1.4.0
+realm.ldap.removeDeletedUsers = true
# URL of the Redmine.
+#
+# SINCE 1.2.0
realm.redmine.url = http://example.com/redmine
#
|