diff options
| author | James Moger <james.moger@gitblit.com> | 2014-09-04 11:03:36 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-09-04 11:03:36 -0400 |
| commit | 969656cd8f417378d9840a246dca698ff8d16551 (patch) | |
| tree | 84fc135588bd3def25f5a2b1b08d5f143632560b | |
| parent | 9f4544301f8ce4016f8dd948d8bc9a754ff3e5da (diff) | |
| parent | 538991e465c7a3badceb5629c3410e16cc900778 (diff) | |
| download | gitblit-969656cd8f417378d9840a246dca698ff8d16551.tar.gz gitblit-969656cd8f417378d9840a246dca698ff8d16551.zip | |
Merge branch 'ticket/141' into develop
| -rw-r--r-- | src/main/java/com/gitblit/servlet/GitblitContext.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/gitblit/servlet/GitblitContext.java b/src/main/java/com/gitblit/servlet/GitblitContext.java index 115af656..d8ccac37 100644 --- a/src/main/java/com/gitblit/servlet/GitblitContext.java +++ b/src/main/java/com/gitblit/servlet/GitblitContext.java @@ -168,7 +168,7 @@ public class GitblitContext extends GuiceServletContextListener { // 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); |