From 9b54923f4ee5411966016f91224e4f4f545f1416 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 17 Jun 2013 15:56:14 -0400
Subject: [PATCH] Option to auto-create accounts based on authenticated container principals (issue-246)

---
 src/main/distrib/data/gitblit.properties |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/src/main/distrib/data/gitblit.properties b/src/main/distrib/data/gitblit.properties
index 2912bfe..412bcae 100644
--- a/src/main/distrib/data/gitblit.properties
+++ b/src/main/distrib/data/gitblit.properties
@@ -499,6 +499,7 @@
 # Alternative user services:
 #    com.gitblit.LdapUserService
 #    com.gitblit.RedmineUserService
+#    com.gitblit.SalesforceUserService
 #
 # Any custom user service implementation must have a public default constructor.
 #
@@ -813,11 +814,24 @@
 # SINCE 0.5.0 
 web.generateActivityGraph = true
 
-# The number of days to show on the activity page.
-# Value must exceed 0 else default of 14 is used
+# The default number of days to show on the activity page.
+# Value must exceed 0 else default of 7 is used
 #
 # SINCE 0.8.0
-web.activityDuration = 14
+web.activityDuration = 7
+
+# Choices for days of activity to display.
+#
+# SPACE-DELIMITED
+# SINCE 1.3.0
+web.activityDurationChoices = 7 14 28 60 90 180
+
+# Case-insensitive list of authors to exclude from metrics.  Useful for
+# eliminating bots.
+#
+# SPACE-DELIMITED
+# SINCE 1.3.0
+web.metricAuthorExclusions =
 
 # The number of commits to display on the summary page
 # Value must exceed 0 else default of 20 is used
@@ -834,10 +848,22 @@
 web.summaryRefsCount = 5
 
 # The number of items to show on a page before showing the first, prev, next
-# pagination links.  A default if 50 is used for any invalid value.
+# pagination links.  A default of 50 is used for any invalid value.
 #
 # SINCE 0.5.0
 web.itemsPerPage = 50
+
+# The number of pushes to display on the overview page
+# Value must exceed 0 else default of 5 is used
+#
+# SINCE 1.3.0
+web.overviewPushCount = 5
+
+# The number of pushes to show on a push page before show the first, prev, next
+# pagination links.  A default of 10 is used for any invalid value.
+#
+# SINCE 1.3.0
+web.pushesPerPage = 10
 
 # Registered file extensions to ignore during Lucene indexing
 #
@@ -930,6 +956,9 @@
 #
 # SINCE 0.6.0
 mail.debug = false
+
+# use SMTPs flag
+mail.smtps = false
 
 # if your smtp server requires authentication, supply the credentials here
 #
@@ -1081,6 +1110,27 @@
 # Advanced Realm Settings
 #
 
+# Auto-creates user accounts based on the servlet container principal.  This
+# assumes that your Gitblit install is a protected resource and your container's
+# authentication process intercepts all Gitblit requests.
+#
+# SINCE 1.3.0
+realm.container.autoCreateAccounts = false
+
+# The SalesforceUserService must be backed by another user service for standard user
+# and team management.
+# default: users.conf
+#
+# RESTART REQUIRED
+# BASEFOLDER
+realm.salesforce.backingUserService = ${baseFolder}/users.conf
+
+# Restrict the Salesforce user to members of this org.
+# default: 0 (i.e. do not check the Org ID)
+#
+# RESTART REQUIRED
+realm.salesforce.orgId = 0
+
 # URL of the LDAP server.
 # To use encrypted transport, use either ldaps:// URL for SSL or ldap+tls:// to
 # send StartTLS command.

--
Gitblit v1.9.1