diff options
| author | James Moger <james.moger@gitblit.com> | 2014-09-24 11:58:27 -0600 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-09-24 11:58:27 -0600 |
| commit | a8cac83f310be77c1acb6ef39fc0245787a79834 (patch) | |
| tree | e83ca4f46ddd3a94b7ff7d135012b8653259de05 /src | |
| parent | d402f4ef29fc4b2b6a6376d03211b2941b77d72d (diff) | |
| parent | 4b9b3c972681db34b63e94f3df51627c2da62cf3 (diff) | |
| download | gitblit-a8cac83f310be77c1acb6ef39fc0245787a79834.tar.gz gitblit-a8cac83f310be77c1acb6ef39fc0245787a79834.zip | |
Merged #185 "Fix GITBLIT_HOME environment variable baseFolder support"
Diffstat (limited to 'src')
| -rw-r--r-- | 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 fcc702bb..64d68e77 100644 --- a/src/main/java/com/gitblit/servlet/GitblitContext.java +++ b/src/main/java/com/gitblit/servlet/GitblitContext.java @@ -317,9 +317,9 @@ public class GitblitContext extends DaggerContext { 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); |