From 6cca8699f98a606ff19e88d40a8a2535fdc340e7 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 06 Apr 2012 18:01:58 -0400
Subject: [PATCH] Skeleton LdapUserService based on John Cryiger's implementation

---
 distrib/gitblit.properties |   86 ++++++++++++++++++++++++++++++------------
 1 files changed, 61 insertions(+), 25 deletions(-)

diff --git a/distrib/gitblit.properties b/distrib/gitblit.properties
index 18eafca..acceb88 100644
--- a/distrib/gitblit.properties
+++ b/distrib/gitblit.properties
@@ -91,31 +91,6 @@
 # SINCE 0.8.0
 groovy.postReceiveScripts =
 
-# If true, a Lucene index will be generated and maintained for each repository.
-# Lucene search replaces brute-force Git repository traversal. Initial indexing
-# or reindexing of a repository can be memory intensive so be advised that you
-# may need to adjust your JVM heap setting accordingly (e.g. -Xmx1024M)
-#
-# SINCE 0.9.0
-# RESTART REQUIRED
-lucene.enable  = false
-
-# This value specifies the idle period for the Lucene executor to wait between
-# repository ref checks.  If refs have been changed since the last check, the
-# executor will incrementally index the changes.
-#
-# Gitblit will check all repositories for branch updates 1 minute after startup.
-# Indexes will automatically be built for any repository that is missing its index
-# or if an index version change is detected.
-#
-#   The shortest frequency allowed is every 2 minutes
-#   Decimal frequency values are cast to integers
-#   Frequency values may be specified in mins, hours, or days
-#
-# SINCE 0.9.0
-# RESTART REQUIRED
-lucene.frequency = 2 mins
-
 #
 # Authentication Settings
 #
@@ -160,6 +135,52 @@
 #
 # SINCE 0.5.0 
 realm.minPasswordLength = 5
+
+# URL of the LDAP server.
+#
+# SINCE 1.0.0
+realm.ldap.server = ldap://my.ldap.server
+
+# The LDAP domain to prepend to all usernames during authentication.  If
+# unspecified, all logins must prepend the domain to their username.
+# e.g. mydomain
+#
+# SINCE 1.0.0
+realm.ldap.domain = 
+
+# Login username for LDAP searches.
+# The domain prefix may be omitted if it matches the domain specified in
+# *realm.ldap.domain*. If this value is unspecified, anonymous LDAP login will
+# be used.
+# 
+# e.g. mydomain\\username
+#
+# SINCE 1.0.0
+realm.ldap.username =
+
+# Login password for LDAP searches.
+#
+# SINCE 1.0.0
+realm.ldap.password =
+
+# The LdapUserService must be backed by another user service for standard user
+# and team management.
+# default: users.conf
+#
+# SINCE 1.0.0
+# RESTART REQUIRED
+realm.ldap.backingUserService = users.conf
+
+# Delegate team membership control to LDAP.
+#
+# If true, team user memberships will be specified by LDAP groups.  This will
+# disable team selection in Edit User and user selection in Edit Team.
+#
+# If false, LDAP will only be used for authentication and Gitblit will maintain
+# team memberships with the *realm.ldap.backingUserService*.
+#
+# SINCE 1.0.0
+realm.ldap.maintainTeams = false
 
 #
 # Gitblit Web Settings
@@ -208,6 +229,15 @@
 #
 # SINCE 0.5.0   
 web.allowZipDownloads = true
+
+# Allow optional Lucene integration. Lucene indexing is an opt-in feature.
+# A repository may specify branches to index with Lucene instead of using Git
+# commit traversal. There are scenarios where you may want to completely disable
+# Lucene indexing despite a repository specifying indexed branches.  One such
+# scenario is on a resource-constrained federated Gitblit mirror.
+#
+# SINCE 0.9.0
+web.allowLuceneIndexing = true
 
 # Use Clippy (Flash solution) to provide a copy-to-clipboard button.
 # If false, a button with a more primitive JavaScript-based prompt box will
@@ -398,6 +428,12 @@
 # SINCE 0.5.0
 web.itemsPerPage = 50
 
+# Registered file extensions to ignore during Lucene indexing
+#
+# SPACE-DELIMITED
+# SINCE 0.9.0
+web.luceneIgnoreExtensions = 7z arc arj bin bmp dll doc docx exe gif gz jar jpg lib lzh odg odf odt pdf ppt png so swf xcf xls xlsx zip
+
 # Registered extensions for google-code-prettify
 #
 # SPACE-DELIMITED

--
Gitblit v1.9.1