From a8cac83f310be77c1acb6ef39fc0245787a79834 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Wed, 24 Sep 2014 13:58:27 -0400 Subject: [PATCH] Merged #185 "Fix GITBLIT_HOME environment variable baseFolder support" --- src/main/java/com/gitblit/servlet/GitblitContext.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gitblit/servlet/GitblitContext.java b/src/main/java/com/gitblit/servlet/GitblitContext.java index fcc702b..64d68e7 100644 --- a/src/main/java/com/gitblit/servlet/GitblitContext.java +++ b/src/main/java/com/gitblit/servlet/GitblitContext.java @@ -317,9 +317,9 @@ logger.error(""); } - String baseFromJndi = lookupBaseFolderFromJndi(); - if (!StringUtils.isEmpty(baseFromJndi)) { - path = baseFromJndi; + String externalBase = System.getProperty("GITBLIT_HOME", lookupBaseFolderFromJndi()); + if (!StringUtils.isEmpty(externalBase)) { + path = externalBase; } File base = com.gitblit.utils.FileUtils.resolveParameter(Constants.contextFolder$, contextFolder, path); -- Gitblit v1.9.1