| commit | 718ae7b9f7970ea4475027c8ef91875c0bea5861 | [log] [tgz] |
|---|---|---|
| author | James Moger <james.moger@gitblit.com> | Sat Nov 16 09:12:43 2013 -0500 |
| committer | James Moger <james.moger@gitblit.com> | Tue Nov 26 16:07:04 2013 -0500 |
| tree | 5b6b12e8ce03df5b3733d351f87952dd62baac33 | |
| parent | 6f442a4a7a66a0ba6d5189a0430cd5e95fb39ea8 [diff] |
Automatically disable the Git daemon on Express Change-Id: Ide78d4c5db59a734060ce527a59450eed8433c1a
diff --git a/src/main/java/com/gitblit/GitBlit.java b/src/main/java/com/gitblit/GitBlit.java index 97372e1..6d52e76 100644 --- a/src/main/java/com/gitblit/GitBlit.java +++ b/src/main/java/com/gitblit/GitBlit.java
@@ -3772,6 +3772,10 @@ } } + // disable Git daemon on Express - we can't bind 9418 and we + // can't port-forward to the daemon + webxmlSettings.overrideSetting(Keys.git.daemonPort, 0); + // configure context using the web.xml configureContext(webxmlSettings, base, true); } else {