From fc948cacef9c9b8c0a1e84cbc082ca67cd5f68d9 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 14 Apr 2011 18:29:10 -0400
Subject: [PATCH] Authenticate the webapp against the same realm as the git servlet.
---
gitblit.properties | 40 ++++++++++++++++++++++++++--------------
1 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/gitblit.properties b/gitblit.properties
index 8ea1cc6..65f44d1 100644
--- a/gitblit.properties
+++ b/gitblit.properties
@@ -26,25 +26,19 @@
# Require authentication for http/https push/pull access of git repositories
authenticatePushPull = true
+# Require authentication to see the web ui
+authenticateWebUI = true
+
# Simple user realm file to authenticate users for push/pull
realmFile = users.properties
-
-# User roles for push/pull git repository access
-# (* is the wildcard for any role)
-gitRoles = *
-
-# User roles for administrative features such
-# as create repository, edit repository description,
-# and set repository owner.
-# (* is the wildcard for any role)
-adminRoles = *
#
# Server Settings
#
-debug = true
+debugMode = true
tempFolder = temp
log4jPattern = %-5p %d{MM-dd HH:mm:ss.SSS} %-20.20c{1} %m%n
+
# Aggressive heap management will run the garbage collector on every generated
# page. This slows down page generation but improves heap consumption.
aggressiveHeapManagement = true
@@ -53,8 +47,19 @@
# Git:Blit UI Settings
#
siteName =
+
+# If authenticateWebUI=true, users with "admin" role can create repositories,
+# create users, and edit repository metadata (owner, description, etc)
+#
+# If authenticateWebUI=false, any user can execute the aforementioned functions.
allowAdministration = true
+
repositoriesMessage = Welcome to Git:Blit!<br>A quick and easy way to host your own Git repositories.<br>Built with <a href="http://eclipse.org/jgit">JGit</a>, <a href="http://wicket.apache.org">Wicket</a>, <a href="http://code.google.com/p/google-code-prettify/">google-code-prettify</a>, <a href="http://eclipse.org/jetty">Jetty</a>, <a href="http://www.slf4j.org">SLF4J</a>, <a href="http://logging.apache.org/log4j">Log4j</a>, and <a href="http://jcommander.org">JCommander</a>.
+
+# Use the client timezone when formatting dates.
+# This uses AJAX to determine the browser's timezone and enables Wicket
+# session management for the connection.
+useClientTimezone = false
# Date and Time formats
timestampFormat = h:mm a
@@ -62,8 +67,8 @@
datestampShortFormat = yyyy-MM-dd
datestampLongFormat = EEEE, MMMM d, yyyy
-datetimestampShortFormat = yyyy-MM-dd h:mm a
-datetimestampLongFormat = EEEE, MMMM d, yyyy h:mm a
+datetimestampShortFormat = yyyy-MM-dd h:mm a z
+datetimestampLongFormat = EEEE, MMMM d, yyyy h:mm a z
# Generates a line graph of repository activity over time on the Summary page.
# This is a real-time graph so generation may be expensive.
@@ -79,7 +84,7 @@
# The number of commits to show on each page of a Log
# Value must exceed 0 else default of 50 is used
-logPageCommitsCount = 50
+logPageCommitCount = 50
# Registered extensions for google-code-prettify
prettyPrintExtensions = c cpp cs css htm html java js php pl prefs properties py rb sh sql xml vb
@@ -97,6 +102,13 @@
# 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>
+# Enable ticgit viewer for all repositories (checks for ticgit branch)
+ticgit.global = false
+
+# Enable ticgit viewer for specified repository (checks for ticgit branch)
+ticgit.myrepository = true
+ticgit.ticgit = true
+
#
# Jetty Settings
#
--
Gitblit v1.9.1