From 5450d08e4cd11176bcc50a5b3d001d291bd8982c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 18 Jun 2011 08:28:47 -0400
Subject: [PATCH] Mostly stable war build.
---
distrib/gitblit.properties | 31 +++++++------------------------
1 files changed, 7 insertions(+), 24 deletions(-)
diff --git a/distrib/gitblit.properties b/distrib/gitblit.properties
index 2d55a58..6adf11e 100644
--- a/distrib/gitblit.properties
+++ b/distrib/gitblit.properties
@@ -2,8 +2,7 @@
# Git Servlet Settings
#
-# Allow push/pull over http/https with JGit servlet
-# Changing this value requires a server restart.
+# Allow push/pull over http/https with JGit servlet.
git.enableGitServlet = true
# Base folder for repositories
@@ -11,11 +10,6 @@
# Use forward slashes even on Windows!!
# e.g. c:/gitrepos
git.repositoriesFolder = git
-
-# Export all repositories
-# Changing this value requires a server restart.
-# 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)
@@ -36,7 +30,9 @@
# Changing this value requires a server restart.
web.authenticateAdminPages = true
-# Simple user realm file to authenticate users
+# Either a simple user realm file to authenticate users
+# OR a fully qualified class name that implements the ILoginService interface.
+# Any custom implementation must have a public default constructor.
# Changing this value requires a server restart.
realm.realmFile = users.properties
@@ -154,11 +150,11 @@
# 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
@@ -167,19 +163,6 @@
# The temporary folder to decompress the gitblit webapp.
server.tempFolder = temp
-
-# The common log4j logging pattern
-# http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/PatternLayout.html
-server.log4jPattern = %-5p %d{MM-dd HH:mm:ss.SSS} %-20.20c{1} %m%n
-
-# Alternatively, you may specify a logging pattern for your OS.
-# If the os pattern is blank, the common pattern is used.
-
-# This windows pattern fits (mostly) within the fixed bounds of a command prompt.
-server.log4jPattern.windows = %-5p %m%n
-
-server.log4jPattern.linux =
-
#
# Jetty Settings
--
Gitblit v1.9.1