From edae533cd47384c155485af74ef968453de69b9e Mon Sep 17 00:00:00 2001
From: Alfred Schmid <A.Schmid@ff-muenchen.de>
Date: Wed, 19 Feb 2014 11:04:16 -0500
Subject: [PATCH] Fixed error with negative periods. Using at least ldapCaching period to sync with ldap

---
 src/main/distrib/data/gitblit.properties |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/src/main/distrib/data/gitblit.properties b/src/main/distrib/data/gitblit.properties
index edfa1c4..bd0efd9 100644
--- a/src/main/distrib/data/gitblit.properties
+++ b/src/main/distrib/data/gitblit.properties
@@ -612,6 +612,12 @@
 # SINCE 0.5.0
 web.siteName =
 
+# The canonical url of your Gitblit server to bs used in email notifications.
+# e.g. web.canonicalUrl = https://demo-gitblit.rhcloud.com
+#
+# SINCE 1.4.0
+web.canonicalUrl = 
+
 # You may specify a different logo image for the header but it must be 120x45px.
 # If the specified file does not exist, the default Gitblit logo will be used.
 #
@@ -1502,6 +1508,16 @@
 # If left blank, false is assumed
 realm.ldap.synchronizeUsers.enable = false
 
+# Defines the period to be used when synchronizing users from ldap. 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' 
+# <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
+realm.ldap.synchronizeUsers.ldapSyncPeriod = 5 MINUTES
+
 # Defines whether to delete non-existent LDAP users from the backing user service
 # during synchronization. depends on  realm.ldap.synchronizeUsers.enable = true
 #

--
Gitblit v1.9.1