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: Authenticate the webapp against the same realm as the git servlet.

Right now the implementation is hard-coded to pass the realm into a
singleton.  This won't work for a WAR distribution so I will
need to figure out how to properly authenticate the webapp using form
authentication and the git servlet using basic authentication - host
against the same realm.
---
 gitblit.properties | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'gitblit.properties')

diff --git a/gitblit.properties b/gitblit.properties
index a2e9ab66..65f44d17 100644
--- a/gitblit.properties
+++ b/gitblit.properties
@@ -32,22 +32,13 @@ 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
@@ -56,7 +47,13 @@ aggressiveHeapManagement = true
 # 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.
-- 
cgit v1.2.3