From 4a286829631bd6e69f670ff1ef3e1f22d570b940 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Sat, 22 Oct 2011 09:23:10 -0400 Subject: [PATCH] Fixed null pointer in object cache --- distrib/gitblit.properties | 34 +++++++++++++++++++++++++++++----- 1 files changed, 29 insertions(+), 5 deletions(-) diff --git a/distrib/gitblit.properties b/distrib/gitblit.properties index 2876382..d5e4572 100644 --- a/distrib/gitblit.properties +++ b/distrib/gitblit.properties @@ -87,11 +87,17 @@ # SINCE 0.5.0 web.allowAdministration = true -# Allows remote clients to list repositories and administer the Gitblit instance -# if they have administrator permissions. +# Allows remote clients to list repositories and possibly administer the Gitblit +# server, if the authenticated account has administrator permissions. # -# SINCE 0.6.1 -web.enableRpcServlet = false +# SINCE 0.7.0 +web.enableRpcServlet = true + +# Allows remote clients to administer the Gitblit instance, if the authenticated +# account has administrator permissions. Requires *web.enableRpcServlet=true*. +# +# SINCE 0.7.0 +web.enableRpcAdministration = false # Allow dynamic zip downloads. # @@ -116,7 +122,14 @@ # SINCE 0.6.0 web.showFederationRegistrations = false -# This is the message display above the repositories table. +# This is the message displayed when *web.authenticateViewPages=true*. +# This can point to a file with Markdown content. +# Specifying "gitblit" uses the internal login message. +# +# SINCE 0.7.0 +web.loginMessage = gitblit + +# This is the message displayed above the repositories table. # This can point to a file with Markdown content. # Specifying "gitblit" uses the internal welcome message. # @@ -275,10 +288,13 @@ # Example global regex substitutions # Use !!! to separate the search pattern and the replace pattern # searchpattern!!!replacepattern +# SINCE 0.5.0 regex.global.bug = \\b(Bug:)(\\s*[#]?|-){0,1}(\\d+)\\b!!!<a href="http://somehost/bug/$3">Bug-Id: $3</a> +# SINCE 0.5.0 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 +# SINCE 0.5.0 regex.myrepository.bug = \\b(Bug:)(\\s*[#]?|-){0,1}(\\d+)\\b!!!<a href="http://elsewhere/bug/$3">Bug-Id: $3</a> # @@ -307,6 +323,7 @@ # # SINCE 0.6.0 mail.username = +# SINCE 0.6.0 mail.password = # from address for generated emails @@ -452,6 +469,13 @@ # RESTART REQUIRED server.useNio = true +# Context path for the GO application. You might want to change the context +# path if running Gitblit behind a proxy layer such as mod_proxy. +# +# SINCE 0.7.0 +# RESTART REQUIRED +server.contextPath = / + # Standard http port to serve. <= 0 disables this connector. # On Unix/Linux systems, ports < 1024 require root permissions. # Recommended value: 80 or 8080 -- Gitblit v1.9.1