From: James Moger <james.moger@gitblit.com>
Date: Sat, 16 Nov 2013 14:12:43 +0000 (-0500)
Subject: Automatically disable the Git daemon on Express
X-Git-Tag: v1.4.0~192
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=718ae7b9f7970ea4475027c8ef91875c0bea5861;p=gitblit.git

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 97372e11..6d52e763 100644
--- a/src/main/java/com/gitblit/GitBlit.java
+++ b/src/main/java/com/gitblit/GitBlit.java
@@ -3772,6 +3772,10 @@ public class GitBlit implements ServletContextListener {
 					}
 				}
 
+				// 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 {