From d39680e9f54322ddcb40b00503a8ee30aee6c99c Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Tue, 28 Jun 2011 20:12:51 -0400 Subject: [PATCH] Changes for minor 0.5.1 release. --- distrib/gitblit.properties | 101 +++++++++++++++++++++++++++++++++----------------- 1 files changed, 66 insertions(+), 35 deletions(-) diff --git a/distrib/gitblit.properties b/distrib/gitblit.properties index 4e2965f..81ce0eb 100644 --- a/distrib/gitblit.properties +++ b/distrib/gitblit.properties @@ -2,33 +2,43 @@ # Git Servlet Settings # -# Allow push/pull over http/https with JGit servlet -git.enableGitServlet = true - # Base folder for repositories +# Changing this value requires a server restart. # Use forward slashes even on Windows!! +# e.g. c:/gitrepos git.repositoriesFolder = git -# Export all repositories -# if false, each exported repository must have a .git/git-daemon-export-ok file -git.exportAll = true +# Search the repositories folder subfolders for other repositories. +# Repositories MAY NOT be nested (i.e. one repository within another) +# but they may be grouped together in subfolders. +# e.g. c:/gitrepos/libraries/mylibrary.git +# c:/gitrepos/libraries/myotherlibrary.git +git.searchRepositoriesSubfolders = true -# Search repositories folder for nested repositories -# e.g. /libraries/mylibrary.git -git.nestedRepositories = true +# Allow push/pull over http/https with JGit servlet. +git.enableGitServlet = true # # Authentication Settings # # Require authentication to see everything but the admin pages +# Changing this value requires a server restart. web.authenticateViewPages = false # Require admin authentication for the admin functions and pages +# Changing this value requires a server restart. web.authenticateAdminPages = true -# Simple user realm file to authenticate users -realm.realmFile = users.properties +# Allow Gitblit to store a cookie in the user's browser for automatic +# authentication. The cookie is generated by the user service. +web.allowCookieAuthentication = true + +# Either the path to a simple user properties file +# OR a fully qualified class name that implements the IUserService interface. +# Any custom implementation must have a public default constructor. +# Changing this value requires a server restart. +realm.userService = users.properties # How to store passwords. # Valid values are plain or md5. Default is md5. @@ -44,14 +54,18 @@ # If blank Gitblit is displayed. web.siteName = -# If web.authenticate=true, users with "admin" role can create repositories, -# create users, and edit repository metadata (owner, description, etc) +# If web.authenticateAdminPages=true, users with "admin" role can create +# repositories, create users, and edit repository metadata. # -# If web.authenticate=false, any user can execute the aforementioned functions. +# If web.authenticateAdminPages=false, any user can execute the aforementioned +# functions. web.allowAdministration = true -# Allow dyanamic zip downloads. +# Allow dynamic zip downloads. web.allowZipDownloads = true + +# Default number of entries to include in RSS Syndication links +web.syndicationEntries = 25 # This is the message display above the repositories table. # This can point to a file with Markdown content. @@ -59,21 +73,32 @@ web.repositoriesMessage = gitblit # Use the client timezone when formatting dates. -# This uses AJAX to determine the browser's timezone. +# This uses AJAX to determine the browser's timezone and may require more +# server overhead because a Wicket session is created. All Gitblit pages +# attempt to be stateless, if possible. +# Changing this value requires a server restart. web.useClientTimezone = false # Date and Time formats +# http://download.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html web.datestampShortFormat = yyyy-MM-dd web.datetimestampLongFormat = EEEE, MMMM d, yyyy h:mm a z +# Mount parameters +# true: http://localhost/commit/myrepo/abcdef +# false: http://localhost/commit/?r=myrepo&h=abcdef +# Changing this value requires a server restart. +web.mountParameters = true + # Show other URLs on the summary page for accessing your git repositories # Use spaces to separate urls. {0} is the token for the repository name. +# e.g. # web.otherUrls = ssh://localhost/git/{0} git://localhost/git/{0} web.otherUrls = # Choose how to present the repositories list. -# grouped = group nested/subfolder repositories together (no sorting) -# flat = flat list of repositories (sorting allowed) +# grouped = group nested/subfolder repositories together (no sorting) +# flat = flat list of repositories (sorting allowed) web.repositoryListType = grouped # If using a grouped repository list and there are repositories at the @@ -92,15 +117,17 @@ web.showSearchTypeSelection = false # Generates a line graph of repository activity over time on the Summary page. -# This is a real-time graph so generation may be expensive. +# This uses the Google Charts API. web.generateActivityGraph = true # The number of commits to display on the summary page # Value must exceed 0 else default of 20 is used web.summaryCommitCount = 16 -# The number of tags/heads to display on the summary page -# Value must exceed 0 else default of 5 is used +# The number of tags/branches to display on the summary page. +# -1 = all tags/branches +# 0 = hide tags/branches +# N = N tags/branches web.summaryRefsCount = 5 # The number of items to show on a page before showing the first, prev, next @@ -108,22 +135,27 @@ web.itemsPerPage = 50 # Registered extensions for google-code-prettify +# (case-insensitive) web.prettyPrintExtensions = c cpp cs css htm html java js php pl prefs properties py rb sh sql xml vb # Registered extensions for markdown transformation -web.markdownExtensions = md mkd markdown +# (CASE-SENSITIVE) +web.markdownExtensions = md mkd markdown MD MKD # Image extensions +# (case-insensitive) web.imageExtensions = bmp jpg gif png # Registered extensions for binary blobs +# (case-insensitive) web.binaryExtensions = jar pdf tar.gz zip # Aggressive heap management will run the garbage collector on every generated -# page. This slows down page generation but improves heap consumption. -web.aggressiveHeapManagement = true +# page. This slows down page generation a little but improves heap consumption. +web.aggressiveHeapManagement = false # Run the webapp in debug mode +# Changing this value requires a server restart. web.debugMode = false # Enable/disable global regex substitutions (i.e. shared across repositories) @@ -132,23 +164,22 @@ # Example global regex substitutions # Use !!! to separate the search pattern and the replace pattern # searchpattern!!!replacepattern -#regex.global.bug = \\b(Bug:)(\\s*[#]?|-){0,1}(\\d+)\\b!!!<a href="http://somehost/bug/$3">Bug-Id: $3</a> -#regex.global.changeid = \\b(Change-Id:\\s*)([A-Za-z0-9]*)\\b!!!<a href="http://somehost/changeid/$2">Change-Id: $2</a> +regex.global.bug = \\b(Bug:)(\\s*[#]?|-){0,1}(\\d+)\\b!!!<a href="http://somehost/bug/$3">Bug-Id: $3</a> +regex.global.changeid = \\b(Change-Id:\\s*)([A-Za-z0-9]*)\\b!!!<a href="http://somehost/changeid/$2">Change-Id: $2</a> # Example per-repository regex substitutions overrides global -#regex.myrepository.bug = \\b(Bug:)(\\s*[#]?|-){0,1}(\\d+)\\b!!!<a href="http://elsewhere/bug/$3">Bug-Id: $3</a> +regex.myrepository.bug = \\b(Bug:)(\\s*[#]?|-){0,1}(\\d+)\\b!!!<a href="http://elsewhere/bug/$3">Bug-Id: $3</a> # # Server Settings # -server.tempFolder = temp -server.log4jPattern = %-5p %d{MM-dd HH:mm:ss.SSS} %-20.20c{1} %m%n -server.log4jPattern.windows = %-5p %m%n -server.log4jPattern.linux = +# Changing any of these values requires a server restart. +# The temporary folder to decompress the gitblit webapp. +server.tempFolder = temp # -# Jetty Settings +# Jetty Http/Https Server Settings # # Use Jetty NIO connectors. If false, Jetty Socket connectors will be used. @@ -162,13 +193,13 @@ # Specify the interface for Jetty to bind the standard connector. # You may specify an ip or an empty value to bind to all interfaces. -# Specifying localhost will result in Git:Blit ONLY listening to requests to +# Specifying localhost will result in Gitblit ONLY listening to requests to # localhost. server.httpBindInterface = localhost # Specify the interface for Jetty to bind the secure connector. # You may specify an ip or an empty value to bind to all interfaces. -# Specifying localhost will result in Git:Blit ONLY listening to requests to +# Specifying localhost will result in Gitblit ONLY listening to requests to # localhost. server.httpsBindInterface = localhost @@ -176,7 +207,7 @@ # Keystore password and certificate password must match. # This is provided for convenience, its probably more secure to set this value # using the --storePassword command line parameter. -server.storePassword = dosomegit +server.storePassword = gitblit # Port for shutdown monitor to listen on. server.shutdownPort = 8081 -- Gitblit v1.9.1