diff options
| author | Koen Serry <koen@serry.org> | 2014-08-03 10:50:14 +0200 |
|---|---|---|
| committer | Koen Serry <koen@serry.org> | 2014-08-03 10:50:14 +0200 |
| commit | 538991e465c7a3badceb5629c3410e16cc900778 (patch) | |
| tree | ebdab2734fe7271b19c77bfa18c15dfa975553bb /src/main/java/com/gitblit/servlet | |
| parent | 3e0c6ca8a65bd4b076cac1451c9cdfde4be1d4b8 (diff) | |
| download | gitblit-538991e465c7a3badceb5629c3410e16cc900778.tar.gz gitblit-538991e465c7a3badceb5629c3410e16cc900778.zip | |
Allow gitblit baseFolder to be defined by a system property
Diffstat (limited to 'src/main/java/com/gitblit/servlet')
| -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 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); |