From 0e44acbb2fec928a1606dc60f427a148fff405c9 Mon Sep 17 00:00:00 2001
From: Mohamed Ragab <moragab@gmail.com>
Date: Wed, 02 May 2012 11:15:01 -0400
Subject: [PATCH] Added a script to facilitate setting the proxy host and port and no proxy hosts, and then it concatenates all the java system properties for setting the java proxy configurations and puts the resulting string in an environment variable JAVA_PROXY_CONFIG, modified the scirpts gitblit, gitblit-ubuntu, and gitblit-centos to source the java-proxy-config.sh script and then include the resulting java proxy configuration in the java command
---
src/com/gitblit/MakeCertificate.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/com/gitblit/MakeCertificate.java b/src/com/gitblit/MakeCertificate.java
index eafb98a..f2fc730 100644
--- a/src/com/gitblit/MakeCertificate.java
+++ b/src/com/gitblit/MakeCertificate.java
@@ -43,9 +43,13 @@
import com.beust.jcommander.Parameters;
import com.gitblit.utils.TimeUtils;
+/**
+ * Utility class to generate self-signed certificates.
+ *
+ * @author James Moger
+ *
+ */
public class MakeCertificate {
-
- private static final FileSettings FILESETTINGS = new FileSettings();
private static final String BC = org.bouncycastle.jce.provider.BouncyCastleProvider.PROVIDER_NAME;
@@ -59,7 +63,8 @@
jc.usage();
}
File keystore = new File("keystore");
- generateSelfSignedCertificate(params.alias, keystore, params.storePassword, params.subject);
+ generateSelfSignedCertificate(params.hostname, keystore, params.storePassword,
+ params.subject);
}
public static void generateSelfSignedCertificate(String hostname, File keystore,
@@ -155,11 +160,16 @@
}
}
+ /**
+ * JCommander Parameters class for MakeCertificate.
+ */
@Parameters(separators = " ")
private static class Params {
- @Parameter(names = { "--alias" }, description = "Server alias", required = true)
- public String alias;
+ private static final FileSettings FILESETTINGS = new FileSettings(Constants.PROPERTIES_FILE);
+
+ @Parameter(names = { "--hostname" }, description = "Server Hostname", required = true)
+ public String hostname;
@Parameter(names = { "--subject" }, description = "Certificate subject", required = true)
public String subject;
--
Gitblit v1.9.1