summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/com/gitblit/GitBlitServer.java4
-rw-r--r--src/com/gitblit/MakeRepository.java51
2 files changed, 2 insertions, 53 deletions
diff --git a/src/com/gitblit/GitBlitServer.java b/src/com/gitblit/GitBlitServer.java
index b5acd3df..0978bc86 100644
--- a/src/com/gitblit/GitBlitServer.java
+++ b/src/com/gitblit/GitBlitServer.java
@@ -170,7 +170,7 @@ public class GitBlitServer {
if (params.securePort > 0) {
File keystore = new File("keystore");
if (!keystore.exists()) {
- logger.info("Generating self-signed ssl certificate");
+ logger.info("Generating self-signed SSL certificate");
generateSelfSignedCertificate("localhost", keystore, params.storePassword);
}
if (keystore.exists()) {
@@ -331,7 +331,7 @@ public class GitBlitServer {
SslSocketConnector ssl = new SslSocketConnector();
connector = ssl;
}
- connector.setAllowRenegotiate(true);
+ connector.setAllowRenegotiate(false);
connector.setKeystore(keystore.getAbsolutePath());
connector.setPassword(password);
connector.setPort(port);
diff --git a/src/com/gitblit/MakeRepository.java b/src/com/gitblit/MakeRepository.java
deleted file mode 100644
index 15240f83..00000000
--- a/src/com/gitblit/MakeRepository.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.gitblit;
-
-import java.io.File;
-
-import org.eclipse.jgit.api.Git;
-import org.eclipse.jgit.api.InitCommand;
-
-import com.beust.jcommander.JCommander;
-import com.beust.jcommander.Parameter;
-import com.beust.jcommander.ParameterException;
-import com.beust.jcommander.Parameters;
-
-public class MakeRepository {
-
- public static void main(String... args) throws Exception {
- Params params = new Params();
- JCommander jc = new JCommander(params);
- try {
- jc.parse(args);
- if (params.help)
- jc.usage();
- } catch (ParameterException t) {
- jc.usage();
- }
-
- File directory = new File(params.create);
- InitCommand init = new InitCommand();
- init.setDirectory(directory);
- init.setBare(true);
- Git git = init.call();
- git.getRepository().close();
- System.out.println("GIT repository " + directory.getCanonicalPath() + " created.");
- }
-
- @Parameters(separators = " ")
- private static class Params {
-
- /*
- * Help/Usage
- */
- @Parameter(names = { "-h", "--help" }, description = "Show this help")
- public Boolean help = false;
-
- /*
- * Repository to Create
- */
- @Parameter(names = { "--create" }, description = "GIT Repository to Create", required = true)
- public String create = "";
-
- }
-}