Merge branch 'master' of https://github.com/gitblit/gitblit into enhancedLdap

Conflicts:
	distrib/gitblit.properties

1 files changed, 59 insertions, 46 deletions

diff --git a/distrib/gitblit.properties b/distrib/gitblit.properties
index 3419e005..a1ec3053 100644
--- a/distrib/gitblit.properties
+++ b/distrib/gitblit.properties
@@ -93,7 +93,7 @@ git.certificateUsernameOIDs = CN
 
 # Only serve/display bare repositories.
 # If there are non-bare repositories in git.repositoriesFolder and this setting
-# is true, they will be excluded from the ui.
+# is true, they will be excluded from the ui. 
 #
 # SINCE 0.9.0
 git.onlyAccessBareRepositories = false
@@ -172,7 +172,7 @@ git.defaultGarbageCollectionThreshold = 500k
 
 # The default period, in days, between GCs for a repository.  If the total filesize
 # of the loose object exceeds *git.garbageCollectionThreshold* or the repository's
-# custom threshold, this period will be short-circuited.
+# custom threshold, this period will be short-circuited. 
 #
 # e.g. if a repository collects 100KB of loose objects every day with a 500KB
 # threshold and a period of 7 days, it will take 5 days for the loose objects to
@@ -261,7 +261,7 @@ git.packedGitOpenFiles = 128
 # typically has to deal with ~10-12 MiB XML files, so 15 m would be a reasonable
 # setting in that environment. Setting this too high may cause the JVM to run out
 # of heap space when handling very big binary files, such as device firmware or
-# CD-ROM ISO images. Make sure to adjust your JVM heap accordingly.
+# CD-ROM ISO images. Make sure to adjust your JVM heap accordingly. 
 #
 # Default is 50 MiB on all platforms.
 #
@@ -278,7 +278,7 @@ git.streamFileThreshold = 50m
 # a call to munmap() can be made by the JVM native code.
 #
 # In server applications (such as Gitblit) that need to access many pack files,
-# setting this to true risks artificially running out of virtual address space,
+# setting this to true risks artificially running out of virtual address space, 
 # as the garbage collector cannot reclaim unused mapped spaces fast enough.
 #
 # Default on JGit is false. Although potentially slower, it yields much more
@@ -316,7 +316,7 @@ groovy.grapeFolder = groovy/grape
 # to change.
 #
 # Script names are case-sensitive on case-sensitive file systems.  You may omit
-# the traditional ".groovy" from this list if your file extension is ".groovy"
+# the traditional ".groovy" from this list if your file extension is ".groovy" 
 #
 # NOTE:
 # These scripts are only executed when pushing to *Gitblit*, not to other Git
@@ -336,7 +336,7 @@ groovy.preReceiveScripts =
 # You might trigger a continuous-integration build here or send a notification.
 #
 # Script names are case-sensitive on case-sensitive file systems.  You may omit
-# the traditional ".groovy" from this list if your file extension is ".groovy"
+# the traditional ".groovy" from this list if your file extension is ".groovy" 
 #
 # NOTE:
 # These scripts are only executed when pushing to *Gitblit*, not to other Git
@@ -344,7 +344,7 @@ groovy.preReceiveScripts =
 # repositories. These are NOT repository-specific scripts!  Within the script
 # you may customize the control-flow for a specific repository by checking the
 # *repository* variable.
-#
+# 
 # SPACE-DELIMITED
 # CASE-SENSITIVE
 # SINCE 0.8.0
@@ -353,7 +353,7 @@ groovy.postReceiveScripts =
 # Repository custom fields for Groovy Hook mechanism
 #
 # List of key=label pairs of custom fields to prompt for in the Edit Repository
-# page.  These keys are stored in the repository's git config file in the
+# page.  These keys are stored in the repository's git config file in the 
 # section [gitblit "customFields"].  Key names are alphanumeric only.  These
 # fields are intended to be used for the Groovy hook mechanism where a script
 # can adjust it's execution based on the custom fields stored in the repository
@@ -363,7 +363,7 @@ groovy.postReceiveScripts =
 #
 # SPACE-DELIMITED
 # SINCE 1.0.0
-groovy.customFields =
+groovy.customFields = 
 
 #
 # Authentication Settings
@@ -411,13 +411,13 @@ realm.userService = users.conf
 # combined-md5 is the hash of username.toLowerCase()+password.
 # Default is md5.
 #
-# SINCE 0.5.0
+# SINCE 0.5.0 
 realm.passwordStorage = md5
 
 # Minimum valid length for a plain text password.
 # Default value is 5.  Absolute minimum is 4.
 #
-# SINCE 0.5.0
+# SINCE 0.5.0 
 realm.minPasswordLength = 5
 
 #
@@ -432,30 +432,30 @@ web.siteName =
 # repositories, create users, and edit repository metadata.
 #
 # If *web.authenticateAdminPages*=false, any user can execute the aforementioned
-# functions.
+# functions. 
 #
-# SINCE 0.5.0
+# SINCE 0.5.0 
 web.allowAdministration = true
 
-# Allows rpc clients to list repositories and possibly manage or administer the
+# Allows rpc clients to list repositories and possibly manage or administer the 
 # Gitblit server, if the authenticated account has administrator permissions.
 # See *web.enableRpcManagement* and *web.enableRpcAdministration*.
 #
-# SINCE 0.7.0
+# SINCE 0.7.0 
 web.enableRpcServlet = true
 
 # Allows rpc clients to manage repositories and users of the Gitblit instance,
 # if the authenticated account has administrator permissions.
 # Requires *web.enableRpcServlet=true*.
 #
-# SINCE 0.7.0
+# SINCE 0.7.0 
 web.enableRpcManagement = false
 
 # Allows rpc clients to control the server settings and monitor the health of this
 # this Gitblit instance, if the authenticated account has administrator permissions.
 # Requires *web.enableRpcServlet=true* and *web.enableRpcManagement*.
 #
-# SINCE 0.7.0
+# SINCE 0.7.0 
 web.enableRpcAdministration = false
 
 # Full path to a configurable robots.txt file.  With this file you can control
@@ -463,7 +463,7 @@ web.enableRpcAdministration = false
 # http://googlewebmastercentral.blogspot.com/2008/06/improving-on-robots-exclusion-protocol.html
 #
 # SINCE 1.0.0
-web.robots.txt =
+web.robots.txt = 
 
 # If true, the web ui layout will respond and adapt to the browser's dimensions.
 # if false, the web ui will use a 940px fixed-width layout.
@@ -479,9 +479,22 @@ web.allowGravatar = true
 
 # Allow dynamic zip downloads.
 #
-# SINCE 0.5.0
+# SINCE 0.5.0   
 web.allowZipDownloads = true
 
+# If *web.allowZipDownloads=true* the following formats will be displayed for
+# download compressed archive links:
+#
+# zip   = standard .zip
+# tar   = standard tar format (preserves *nix permissions and symlinks)
+# gz    = gz-compressed tar
+# xz    = xz-compressed tar
+# bzip2 = bzip2-compressed tar
+#
+# SPACE-DELIMITED
+# SINCE 1.2.0
+web.compressedDownloads = zip gz
+
 # 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
@@ -510,7 +523,7 @@ web.syndicationEntries = 25
 
 # Show the size of each repository on the repositories page.
 # This requires recursive traversal of each repository folder.  This may be
-# non-performant on some operating systems and/or filesystems.
+# non-performant on some operating systems and/or filesystems. 
 #
 # SINCE 0.5.2
 web.showRepositorySizes = true
@@ -519,13 +532,13 @@ web.showRepositorySizes = true
 # of the Repositories and Activity pages.  Keep them very simple because you
 # are likely to run into encoding issues if they are too complex.
 #
-# Use !!! to separate the filters
+# Use !!! to separate the filters 
 #
 # SINCE 0.8.0
 web.customFilters =
 
 # Show federation registrations (without token) and the current pull status
-# to non-administrator users.
+# to non-administrator users. 
 #
 # SINCE 0.6.0
 web.showFederationRegistrations = false
@@ -549,12 +562,12 @@ web.repositoriesMessage = gitblit
 # is always appended to the encoding list.  If all encodings fail to cleanly
 # decode the blob content, UTF-8 will be used with the standard malformed
 # input/unmappable character replacement strings.
-#
+# 
 # SPACE-DELIMITED
 # SINCE 1.0.0
 web.blobEncodings = UTF-8 ISO-8859-1
 
-# Manually set the default timezone to be used by Gitblit for display in the
+# Manually set the default timezone to be used by Gitblit for display in the 
 # web ui.  This value is independent of the JVM timezone.  Specifying a blank
 # value will default to the JVM timezone.
 # e.g. America/New_York, US/Pacific, UTC, Europe/Berlin
@@ -626,7 +639,7 @@ web.forwardSlashCharacter = /
 #
 # SPACE-DELIMITED
 # SINCE 0.5.0
-web.otherUrls =
+web.otherUrls = 
 
 # Choose how to present the repositories list.
 #   grouped = group nested/subfolder repositories together (no sorting)
@@ -642,8 +655,8 @@ web.repositoryListType = grouped
 # SINCE 0.5.0
 web.repositoryRootGroupName = main
 
-# Display the repository swatch color next to the repository name link in the
-# repositories list.
+# Display the repository swatch color next to the repository name link in the 
+# repositories list. 
 #
 # SINCE 0.8.0
 web.repositoryListSwatches = true
@@ -667,7 +680,7 @@ web.showSearchTypeSelection = false
 # Generates a line graph of repository activity over time on the Summary page.
 # This uses the Google Charts API.
 #
-# SINCE 0.5.0
+# SINCE 0.5.0 
 web.generateActivityGraph = true
 
 # The number of days to show on the activity page.
@@ -719,7 +732,7 @@ web.markdownExtensions = md mkd markdown MD MKD
 #
 # SPACE-DELIMITED
 # SINCE 0.5.0
-web.imageExtensions = bmp jpg gif png
+web.imageExtensions = bmp jpg gif png 
 
 # Registered extensions for binary blobs
 #
@@ -728,7 +741,7 @@ web.imageExtensions = bmp jpg gif png
 web.binaryExtensions = jar pdf tar.gz zip
 
 # Aggressive heap management will run the garbage collector on every generated
-# page.  This slows down page generation a little but improves heap consumption.
+# page.  This slows down page generation a little but improves heap consumption. 
 #
 # SINCE 0.5.0
 web.aggressiveHeapManagement = false
@@ -788,13 +801,13 @@ mail.password =
 # from address for generated emails
 #
 # SINCE 0.6.0
-mail.fromAddress =
+mail.fromAddress = 
 
 # List of email addresses for the Gitblit administrators
 #
 # SPACE-DELIMITED
 # SINCE 0.6.0
-mail.adminAddresses =
+mail.adminAddresses = 
 
 # List of email addresses for sending push email notifications.
 #
@@ -858,7 +871,7 @@ federation.proposalsFolder = proposals
 # SINCE 0.6.0
 federation.defaultFrequency = 60 mins
 
-# Federation Sets are named groups of repositories.  The Federation Sets are
+# Federation Sets are named groups of repositories.  The Federation Sets are 
 # available for selection in the repository settings page.  You can assign a
 # repository to one or more sets and then distribute the token for the set.
 # This allows you to grant federation pull access to a subset of your available
@@ -867,7 +880,7 @@ federation.defaultFrequency = 60 mins
 # SPACE-DELIMITED
 # CASE-SENSITIVE
 # SINCE 0.6.0
-federation.sets =
+federation.sets = 
 
 # Federation pull registrations
 # Registrations are read once, at startup.
@@ -899,8 +912,8 @@ federation.sets =
 #   clone from the origin until pushed to or otherwise manipulated.
 #
 # mergeAccounts:
-#   if true, remote accounts and their permissions are merged into your
-#   users.properties file
+#   if true, remote accounts and their permissions are merged into your 
+#   users.properties file 
 #
 # notifyOnError:
 #   if true and the mail configuration is properly set, administrators will be
@@ -919,8 +932,8 @@ federation.sets =
 #federation.example1.token = 6f3b8a24bf970f17289b234284c94f43eb42f0e4
 #federation.example1.frequency = 120 mins
 #federation.example1.folder =
-#federation.example1.bare = true
-#federation.example1.mirror = true
+#federation.example1.bare = true 
+#federation.example1.mirror = true 
 #federation.example1.mergeAccounts = true
 
 #
@@ -936,7 +949,7 @@ realm.ldap.server = ldap://localhost
 
 # Login username for LDAP searches.
 # If this value is unspecified, anonymous LDAP login will be used.
-#
+# 
 # e.g. mydomain\\username
 #
 # SINCE 1.0.0
@@ -976,7 +989,7 @@ realm.ldap.accountBase = OU=Users,OU=UserControl,OU=MyOrganization,DC=MyDomain
 
 # Filter criteria for LDAP users
 #
-# Query pattern to use when searching for a user account. This may be any valid
+# Query pattern to use when searching for a user account. This may be any valid 
 # LDAP query expression, including the standard (&) and (|) operators.
 #
 # Variables may be injected via the ${variableName} syntax.
@@ -989,14 +1002,14 @@ realm.ldap.accountPattern = (&(objectClass=person)(sAMAccountName=${username}))
 # Root node for all LDAP groups to be used as Gitblit Teams
 #
 # This is the root node from which subtree team searches will begin.
-# If blank, Gitblit will search ALL nodes.
+# If blank, Gitblit will search ALL nodes.  
 #
 # SINCE 1.0.0
 realm.ldap.groupBase = OU=Groups,OU=UserControl,OU=MyOrganization,DC=MyDomain
 
 # Filter criteria for LDAP groups
 #
-# Query pattern to use when searching for a team. This may be any valid
+# Query pattern to use when searching for a team. This may be any valid 
 # LDAP query expression, including the standard (&) and (|) operators.
 #
 # Variables may be injected via the ${variableName} syntax.
@@ -1005,7 +1018,7 @@ realm.ldap.groupBase = OU=Groups,OU=UserControl,OU=MyOrganization,DC=MyDomain
 #    ${dn} - The Distinguished Name of the user logged in
 #
 # All attributes from the LDAP User record are available. For example, if a user
-# has an attribute "fullName" set to "John", "(fn=${fullName})" will be
+# has an attribute "fullName" set to "John", "(fn=${fullName})" will be 
 # translated to "(fn=John)".
 #
 # SINCE 1.0.0
@@ -1027,7 +1040,7 @@ realm.ldap.admins = @Git_Admins
 #
 # This may be a single attribute, or a string of multiple attributes.  Examples:
 #  displayName - Uses the attribute 'displayName' on the user record
-#  ${personalTitle}. ${givenName} ${surname} - Will concatenate the 3
+#  ${personalTitle}. ${givenName} ${surname} - Will concatenate the 3 
 #       attributes together, with a '.' after personalTitle
 #
 # SINCE 1.0.0
@@ -1039,7 +1052,7 @@ realm.ldap.displayName = displayName
 # This may be a single attribute, or a string of multiple attributes.  Examples:
 #  email - Uses the attribute 'email' on the user record
 #  ${givenName}.${surname}@gitblit.com -Will concatenate the 2 attributes
-#       together with a '.' and '@' creating something like first.last@gitblit.com
+#       together with a '.' and '@' creating something like first.last@gitblit.com 
 #
 # SINCE 1.0.0
 realm.ldap.email = email
@@ -1078,7 +1091,7 @@ realm.redmine.url = http://example.com/redmine
 # Server Settings
 #
 
-# The temporary folder to decompress the embedded gitblit webapp.
+# The temporary folder to decompress the embedded gitblit webapp. 
 #
 # SINCE 0.5.0
 # RESTART REQUIRED