summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2013-11-16 09:12:43 -0500
committerJames Moger <james.moger@gitblit.com>2013-11-26 16:07:04 -0500
commit718ae7b9f7970ea4475027c8ef91875c0bea5861 (patch)
tree5b6b12e8ce03df5b3733d351f87952dd62baac33 /src
parent6f442a4a7a66a0ba6d5189a0430cd5e95fb39ea8 (diff)
downloadgitblit-718ae7b9f7970ea4475027c8ef91875c0bea5861.tar.gz
gitblit-718ae7b9f7970ea4475027c8ef91875c0bea5861.zip
Automatically disable the Git daemon on Express
Change-Id: Ide78d4c5db59a734060ce527a59450eed8433c1a
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/gitblit/GitBlit.java4
1 files changed, 4 insertions, 0 deletions
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 {