summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2011-06-28 20:12:51 -0400
committerJames Moger <james.moger@gitblit.com>2011-06-28 20:12:51 -0400
commitd39680e9f54322ddcb40b00503a8ee30aee6c99c (patch)
treed3cc3883fd44e0547663ff8c45ae6c5b69f3ab6b /src
parentd0e26353e62d17a1f6b765a71e9bb45b54806d70 (diff)
downloadgitblit-d39680e9f54322ddcb40b00503a8ee30aee6c99c.tar.gz
gitblit-d39680e9f54322ddcb40b00503a8ee30aee6c99c.zip
Changes for minor 0.5.1 release.v0.5.1
* Clarified SSL certificate generation and configuration in light of the hostname verificiation that JGit currently does despite the http.sslVerify=false setting. * Added some troubleshooting information related to filesystem permissions and reading repositories. * Switched from JavaService to Apache Commons Daemon. Not sure what happened to JavaService as it stopped working for me on Windows 7 with Java 1.6.0_26. Commons Daemon accomplishes the same thing and offers a nice service control utility.
Diffstat (limited to 'src')
-rw-r--r--src/com/gitblit/Constants.java6
-rw-r--r--src/com/gitblit/MakeCertificate.java6
2 files changed, 8 insertions, 4 deletions
diff --git a/src/com/gitblit/Constants.java b/src/com/gitblit/Constants.java
index 8da04424..69f5786a 100644
--- a/src/com/gitblit/Constants.java
+++ b/src/com/gitblit/Constants.java
@@ -23,7 +23,11 @@ public class Constants {
// The build script extracts this exact line so be careful editing it
// and only use A-Z a-z 0-9 .-_ in the string.
- public static final String VERSION = "0.5.0";
+ public static final String VERSION = "0.5.1";
+
+ // The build script extracts this exact line so be careful editing it
+ // and only use A-Z a-z 0-9 .-_ in the string.
+ public static final String VERSION_DATE = "2011-06-28";
// The build script extracts this exact line so be careful editing it
// and only use A-Z a-z 0-9 .-_ in the string.
diff --git a/src/com/gitblit/MakeCertificate.java b/src/com/gitblit/MakeCertificate.java
index 17124b32..67253c42 100644
--- a/src/com/gitblit/MakeCertificate.java
+++ b/src/com/gitblit/MakeCertificate.java
@@ -57,7 +57,7 @@ public class MakeCertificate {
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,
@@ -158,8 +158,8 @@ public class MakeCertificate {
private static final FileSettings FILESETTINGS = new FileSettings(Constants.PROPERTIES_FILE);
- @Parameter(names = { "--alias" }, description = "Server alias", required = true)
- public String alias;
+ @Parameter(names = { "--hostname" }, description = "Server Hostname", required = true)
+ public String hostname;
@Parameter(names = { "--subject" }, description = "Certificate subject", required = true)
public String subject;