You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2014/05/16 18:50:22 UTC
[1/6] git commit: ACCUMULO-2818 Create standard keystore for Jetty
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 <ct...@apache.org>
Authored: Thu May 15 21:06:32 2014 -0400
Committer: Christopher Tubbs <ct...@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:"
[2/6] git commit: ACCUMULO-2818 Create standard keystore for Jetty
Posted by ct...@apache.org.
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.6.1-SNAPSHOT
Commit: f83f9f968e9f0880b67d4a3729c45de489dc78ad
Parents: b2ecd1c
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu May 15 21:06:32 2014 -0400
Committer: Christopher Tubbs <ct...@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:"
[4/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Posted by ct...@apache.org.
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/01e1181b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/01e1181b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/01e1181b
Branch: refs/heads/master
Commit: 01e1181bfe53b5168cfc29b0cd3d8520daea418a
Parents: fd80bc6 f83f9f9
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri May 16 12:49:12 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri May 16 12:49:12 2014 -0400
----------------------------------------------------------------------
bin/generate_monitor_certificate.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[3/6] git commit: ACCUMULO-2818 Create standard keystore for Jetty
Posted by ct...@apache.org.
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/master
Commit: f83f9f968e9f0880b67d4a3729c45de489dc78ad
Parents: b2ecd1c
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu May 15 21:06:32 2014 -0400
Committer: Christopher Tubbs <ct...@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:"
[5/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Posted by ct...@apache.org.
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/01e1181b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/01e1181b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/01e1181b
Branch: refs/heads/1.6.1-SNAPSHOT
Commit: 01e1181bfe53b5168cfc29b0cd3d8520daea418a
Parents: fd80bc6 f83f9f9
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri May 16 12:49:12 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri May 16 12:49:12 2014 -0400
----------------------------------------------------------------------
bin/generate_monitor_certificate.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[6/6] git commit: Merge branch '1.6.1-SNAPSHOT'
Posted by ct...@apache.org.
Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/18591bc9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/18591bc9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/18591bc9
Branch: refs/heads/master
Commit: 18591bc98a42454e5c6cff0d0c0afc35a5aef34c
Parents: 246c415 01e1181
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri May 16 12:49:24 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri May 16 12:49:24 2014 -0400
----------------------------------------------------------------------
bin/generate_monitor_certificate.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------