Disable GitDaemon by default

diff --git a/releases.moxie b/releases.moxie
index f85808a17e76d0392fc13520aee9c31d6a2319f9..5aedcaccc310627c2705fbd14376bf6fca4fd422 100644 (file)
--- a/releases.moxie
+++ b/releases.moxie
@@ -77,7 +77,7 @@ r17: {
        \r
        settings:\r
        - { name: 'git.daemonBindInterface', defaultValue: 'localhost' }\r
-       - { name: 'git.daemonPort', defaultValue: 9418 }\r
+       - { name: 'git.daemonPort', defaultValue: 0 }\r
     - { name: 'git.defaultIncrementalPushTagPrefix', defaultValue: 'r' }\r
        - { name: 'web.forceDefaultLocale', defaultValue: ' ' }\r
 }\r

diff --git a/src/main/java/com/gitblit/GitBlit.java b/src/main/java/com/gitblit/GitBlit.java
index 7f255ab0bc6e5b8c03bd7d043c02f96fc42df008..4fa6f4f079c9f6643d4381a918f498eef40facb9 100644 (file)
--- 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 {
        \r
        protected void configureGitDaemon() {\r
                String bindInterface = settings.getString(Keys.git.daemonBindInterface, "localhost");\r
-               int port = settings.getInteger(Keys.git.daemonPort, GitDaemon.DEFAULT_PORT);\r
+               int port = settings.getInteger(Keys.git.daemonPort, 0);\r
                if (port > 0) {\r
                        try {\r
                                gitDaemon = new GitDaemon(bindInterface, port, getRepositoriesFolder());\r