From 538991e465c7a3badceb5629c3410e16cc900778 Mon Sep 17 00:00:00 2001 From: Koen Serry Date: Sun, 3 Aug 2014 10:50:14 +0200 Subject: [PATCH] Allow gitblit baseFolder to be defined by a system property --- src/main/java/com/gitblit/servlet/GitblitContext.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/gitblit/servlet/GitblitContext.java b/src/main/java/com/gitblit/servlet/GitblitContext.java index d5b4092c..fcc702bb 100644 --- a/src/main/java/com/gitblit/servlet/GitblitContext.java +++ b/src/main/java/com/gitblit/servlet/GitblitContext.java @@ -153,7 +153,7 @@ public class GitblitContext extends DaggerContext { // if the base folder dosen't match the default assume they don't want to use express, // this allows for other containers to customise the basefolder per context. String defaultBase = Constants.contextFolder$ + "/WEB-INF/data"; - String base = lookupBaseFolderFromJndi(); + String base = System.getProperty("GITBLIT_HOME",lookupBaseFolderFromJndi()); if (!StringUtils.isEmpty(System.getenv("OPENSHIFT_DATA_DIR")) && defaultBase.equals(base)) { // RedHat OpenShift baseFolder = configureExpress(context, webxmlSettings, contextFolder, runtimeSettings); -- 2.39.5