From 5be2d394c28f12269ba1aa8e2bd4f9cbd5db9540 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 20 Oct 2014 16:55:39 -0400
Subject: [PATCH] Merge release-1.6.1
---
src/site/setup_war.mkd | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/site/setup_war.mkd b/src/site/setup_war.mkd
index 3f937e1..a060bae 100644
--- a/src/site/setup_war.mkd
+++ b/src/site/setup_war.mkd
@@ -17,11 +17,15 @@
After you configure baseFolder and restart your container, Gitblit will copy the contents of the `WEB-INF/data` folder to your specified *baseFolder* **IF** the file `${baseFolder}/gitblit.properties` does not already exist. This allows you to get going with minimal fuss.
-#### Specifying baseFolder through web.xml
+#### Specifying baseFolder via GITBLIT_HOME
+
+You can specify `GITBLIT_HOME` either as an environment variable or as a `-DGITBLIT_HOME` JVM system property.
+
+#### Specifying baseFolder via web.xml
You may specify an external location for your data by directly editing `WEB-INF/web.xml` and manipulating the *baseFolder* env-entry. Your servlet container may be smart enough to recognize the change and to restart Gitblit.
-#### Specifying baseFolder through JNDI
+#### Specifying baseFolder via JNDI
This is a better way to configure your *baseFolder* because it survives WAR redeploys or deployments of new versions. These directions assume you are running Tomcat as your container, other containers may have different ways to specify global JNDI environment entries.
--
Gitblit v1.9.1