Comments in config file. Disable TLS renegotiation.

diff --git a/gitblit.properties b/gitblit.properties
index 67c3a095dc83a71612e6e797868d2a830cfbc936..c51fffd5af6e1a83f6b1078aab97393962a8dc9b 100644 (file)
--- a/gitblit.properties
+++ b/gitblit.properties
@@ -6,7 +6,7 @@
 git.allowPushPull = true\r
 \r
 # Base folder for repositories\r
-# Use forward slashes on Windows!!\r
+# Use forward slashes even on Windows!!\r
 git.repositoriesFolder = c:/projects/git\r
 \r
 # Export all repositories\r
@@ -14,6 +14,7 @@ git.repositoriesFolder = c:/projects/git
 git.exportAll = true\r
 \r
 # Search repositories folder for nested repositories\r
+# e.g. /libraries/mylibrary.git\r
 git.nestedRepositories = true\r
 \r
 # The root clone url\r
@@ -38,6 +39,7 @@ server.realmFile = users.properties
 #\r
 # Git:Blit Web Settings\r
 #\r
+# If blank Git:Blit is displayed.\r
 web.siteName =\r
 \r
 # If web.authenticate=true, users with "admin" role can create repositories,\r
@@ -52,8 +54,7 @@ web.allowAdministration = true
 web.repositoriesMessage = gitblit\r
 \r
 # Use the client timezone when formatting dates.\r
-# This uses AJAX to determine the browser's timezone and enables Wicket \r
-# session management for the connection.\r
+# This uses AJAX to determine the browser's timezone.\r
 web.useClientTimezone = false\r
 \r
 # Date and Time formats\r
@@ -134,7 +135,7 @@ server.log4jPattern.linux =
 server.useNio = true\r
 \r
 # Standard http port to serve.  <= 0 disables this connector.\r
-server.httpPort = 0\r
+server.httpPort = 80\r
 \r
 # Secure/SSL https port to serve. <= 0 disables this connector.\r
 server.httpsPort = 443\r

diff --git a/src/com/gitblit/GitBlitServer.java b/src/com/gitblit/GitBlitServer.java
index b5acd3df2a7183d0062d625e58e5cf4e5874d545..0978bc8683923f86b3edaba9ade0f3c2b6b0927a 100644 (file)
--- a/src/com/gitblit/GitBlitServer.java
+++ b/src/com/gitblit/GitBlitServer.java
@@ -170,7 +170,7 @@ public class GitBlitServer {
                if (params.securePort > 0) {\r
                        File keystore = new File("keystore");\r
                        if (!keystore.exists()) {\r
-                               logger.info("Generating self-signed ssl certificate");\r
+                               logger.info("Generating self-signed SSL certificate");\r
                                generateSelfSignedCertificate("localhost", keystore, params.storePassword);\r
                        }\r
                        if (keystore.exists()) {\r
@@ -331,7 +331,7 @@ public class GitBlitServer {
                        SslSocketConnector ssl = new SslSocketConnector();\r
                        connector = ssl;\r
                }\r
-               connector.setAllowRenegotiate(true);\r
+               connector.setAllowRenegotiate(false);\r
                connector.setKeystore(keystore.getAbsolutePath());\r
                connector.setPassword(password);\r
                connector.setPort(port);\r

diff --git a/src/com/gitblit/MakeRepository.java b/src/com/gitblit/MakeRepository.java
deleted file mode 100644 (file)
index 15240f8..0000000
--- a/src/com/gitblit/MakeRepository.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.gitblit;\r
-\r
-import java.io.File;\r
-\r
-import org.eclipse.jgit.api.Git;\r
-import org.eclipse.jgit.api.InitCommand;\r
-\r
-import com.beust.jcommander.JCommander;\r
-import com.beust.jcommander.Parameter;\r
-import com.beust.jcommander.ParameterException;\r
-import com.beust.jcommander.Parameters;\r
-\r
-public class MakeRepository {\r
-\r
-       public static void main(String... args) throws Exception {\r
-               Params params = new Params();\r
-               JCommander jc = new JCommander(params);\r
-               try {\r
-                       jc.parse(args);\r
-                       if (params.help)\r
-                               jc.usage();\r
-               } catch (ParameterException t) {\r
-                       jc.usage();\r
-               }\r
-\r
-               File directory = new File(params.create);\r
-               InitCommand init = new InitCommand();\r
-               init.setDirectory(directory);\r
-               init.setBare(true);\r
-               Git git = init.call();\r
-               git.getRepository().close();\r
-               System.out.println("GIT repository " + directory.getCanonicalPath() + " created.");\r
-       }\r
-\r
-       @Parameters(separators = " ")\r
-       private static class Params {\r
-\r
-               /*\r
-                * Help/Usage\r
-                */\r
-               @Parameter(names = { "-h", "--help" }, description = "Show this help")\r
-               public Boolean help = false;\r
-\r
-               /*\r
-                * Repository to Create\r
-                */\r
-               @Parameter(names = { "--create" }, description = "GIT Repository to Create", required = true)\r
-               public String create = "";\r
-\r
-       }\r
-}\r