summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2013-04-18 08:35:33 -0400
committerJames Moger <james.moger@gitblit.com>2013-04-18 08:35:33 -0400
commitbf822e22e220d016a931332e36f2e15dde5f3029 (patch)
treeeb2714bee100c0b33be2489a348e123cbf2f7e6e
parent3156f36bc53c6f59ebf98599643b46847b277cb0 (diff)
downloadgitblit-bf822e22e220d016a931332e36f2e15dde5f3029.tar.gz
gitblit-bf822e22e220d016a931332e36f2e15dde5f3029.zip
Disable GitDaemon by default
-rw-r--r--releases.moxie2
-rw-r--r--src/main/java/com/gitblit/GitBlit.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/releases.moxie b/releases.moxie
index f85808a1..5aedcacc 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -77,7 +77,7 @@ r17: {
settings:
- { name: 'git.daemonBindInterface', defaultValue: 'localhost' }
- - { name: 'git.daemonPort', defaultValue: 9418 }
+ - { name: 'git.daemonPort', defaultValue: 0 }
- { name: 'git.defaultIncrementalPushTagPrefix', defaultValue: 'r' }
- { name: 'web.forceDefaultLocale', defaultValue: ' ' }
}
diff --git a/src/main/java/com/gitblit/GitBlit.java b/src/main/java/com/gitblit/GitBlit.java
index 7f255ab0..4fa6f4f0 100644
--- a/src/main/java/com/gitblit/GitBlit.java
+++ b/src/main/java/com/gitblit/GitBlit.java
@@ -3227,7 +3227,7 @@ public class GitBlit implements ServletContextListener {
protected void configureGitDaemon() {
String bindInterface = settings.getString(Keys.git.daemonBindInterface, "localhost");
- int port = settings.getInteger(Keys.git.daemonPort, GitDaemon.DEFAULT_PORT);
+ int port = settings.getInteger(Keys.git.daemonPort, 0);
if (port > 0) {
try {
gitDaemon = new GitDaemon(bindInterface, port, getRepositoriesFolder());