summaryrefslogtreecommitdiffstats
path: root/src/site
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2014-10-20 09:33:07 -0400
committerJames Moger <james.moger@gitblit.com>2014-10-20 09:33:07 -0400
commit8a8bc3dc1bc810cef952a12071b6ec7dd8ff9750 (patch)
tree290cc27f839b0f02f47170b44e6a7174ac6e8f5c /src/site
parente10ac6e91b1062c74b800df4aa3f8fbcf7e18243 (diff)
downloadgitblit-8a8bc3dc1bc810cef952a12071b6ec7dd8ff9750.tar.gz
gitblit-8a8bc3dc1bc810cef952a12071b6ec7dd8ff9750.zip
Prepare v1.6.1 documentation updates
Diffstat (limited to 'src/site')
-rw-r--r--src/site/setup_go.mkd4
-rw-r--r--src/site/setup_war.mkd8
2 files changed, 10 insertions, 2 deletions
diff --git a/src/site/setup_go.mkd b/src/site/setup_go.mkd
index 15d0813e..81172447 100644
--- a/src/site/setup_go.mkd
+++ b/src/site/setup_go.mkd
@@ -26,6 +26,10 @@ By default, Gitblit GO stores all data (users, settings, repositories, etc) in t
If you are deploying Gitblit to a *nix platform, you might consider moving the data folder out of the GO installation folder and then creating a symlink named "data" that points to your moved folder.
+#### Specifying baseFolder via GITBLIT_HOME
+
+You can specify `GITBLIT_HOME` either as an environment variable or as a `-DGITBLIT_HOME` JVM system property.
+
### Creating your own Self-Signed SSL Certificate
Gitblit GO (and Gitblit Certificate Authority) automatically generates a Certificate Authority (CA) certificate and an ssl certificate signed by this CA certificate that is bound to *localhost*.
diff --git a/src/site/setup_war.mkd b/src/site/setup_war.mkd
index 3f937e1c..a060bae1 100644
--- a/src/site/setup_war.mkd
+++ b/src/site/setup_war.mkd
@@ -17,11 +17,15 @@ Choose a location that is writeable by your servlet container!
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.