Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT b2ecd1cdb -> f83f9f968 refs/heads/1.6.1-SNAPSHOT fd80bc615 -> 01e1181bf refs/heads/master 246c415fa -> 18591bc98
ACCUMULO-2818 Create standard keystore for Jetty Ensure keystore password is the same as the password for the default key it holds. Remove extraneous parameter for truststore generation. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f83f9f96 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f83f9f96 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f83f9f96 Branch: refs/heads/1.5.2-SNAPSHOT Commit: f83f9f968e9f0880b67d4a3729c45de489dc78ad Parents: b2ecd1c Author: Christopher Tubbs <ctubb...@apache.org> Authored: Thu May 15 21:06:32 2014 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Fri May 16 12:48:24 2014 -0400 ---------------------------------------------------------------------- bin/generate_monitor_certificate.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/f83f9f96/bin/generate_monitor_certificate.sh ---------------------------------------------------------------------- diff --git a/bin/generate_monitor_certificate.sh b/bin/generate_monitor_certificate.sh index fe98bb3..edd4159 100755 --- a/bin/generate_monitor_certificate.sh +++ b/bin/generate_monitor_certificate.sh @@ -58,9 +58,9 @@ if [ -e "$CERTPATH" ]; then fi fi -${JAVA_HOME}/bin/keytool -genkey -alias $ALIAS -keyalg RSA -keypass $KEYPASS -storepass $STOREPASS -keystore $KEYSTOREPATH -${JAVA_HOME}/bin/keytool -export -alias $ALIAS -storepass $STOREPASS -file $CERTPATH -keystore $KEYSTOREPATH -echo "yes" | ${JAVA_HOME}/bin/keytool -import -v -trustcacerts -alias $ALIAS -file $CERTPATH -keystore $TRUSTSTOREPATH -keypass $KEYPASS -storepass $STOREPASS +${JAVA_HOME}/bin/keytool -genkey -alias $ALIAS -keyalg RSA -keypass $KEYPASS -storepass $KEYPASS -keystore $KEYSTOREPATH +${JAVA_HOME}/bin/keytool -export -alias $ALIAS -storepass $KEYPASS -file $CERTPATH -keystore $KEYSTOREPATH +echo "yes" | ${JAVA_HOME}/bin/keytool -import -v -trustcacerts -alias $ALIAS -file $CERTPATH -keystore $TRUSTSTOREPATH -storepass $STOREPASS echo echo "keystore and truststore generated. now add the following to accumulo-site.xml:"