diff options
| author | James Moger <james.moger@gitblit.com> | 2014-09-04 09:06:17 -0600 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-09-04 09:06:17 -0600 |
| commit | b743e0cd237f63ae2c1ba0b933df3174b250e6a1 (patch) | |
| tree | 120b5ca444ddb8ccd7aec2298788c0787791301c /src/main/java | |
| parent | e46ddb3c20366d4d68409739e32717ab0d036aa4 (diff) | |
| parent | 538991e465c7a3badceb5629c3410e16cc900778 (diff) | |
| download | gitblit-b743e0cd237f63ae2c1ba0b933df3174b250e6a1.tar.gz gitblit-b743e0cd237f63ae2c1ba0b933df3174b250e6a1.zip | |
Merged #141 "Allow gitblit baseFolder to be defined by a system property"
Diffstat (limited to 'src/main/java')
| -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); |