Repository: incubator-slider Updated Branches: refs/heads/develop 7a8f39f46 -> 85b7620b3 Updated Tags: refs/tags/HDP-2.2.0.0-tag [created] 5ac15a01f refs/tags/HDP-2.2.1.1-tag [created] 5ac15a01f refs/tags/HDP-2.2.3.0-tag [created] a40cdecc3 refs/tags/HDP-2.2.4.0-tag [created] a40cdecc3 refs/tags/HDP-2.2.4.14-tag [created] a40cdecc3 refs/tags/HDP-2.2.4.2-tag [created] a40cdecc3 refs/tags/HDP-2.2.5.0-tag [created] a40cdecc3 refs/tags/HDP-2.2.6.0-tag [created] a40cdecc3 refs/tags/release-0.30-rc0-tag [created] e58cb2f5a refs/tags/release-0.30-tag [created] 7b16cdfc7 refs/tags/release-0.40.0-rc0-tag [created] 79eff3ba5 refs/tags/release-0.40.0-tag [created] c484bef43 refs/tags/release-0.50.1-rc0-tag [created] 13f730837 refs/tags/release-0.50.2-incubating-rc0-tag [created] e4ef13666 refs/tags/release-0.60.0-incubating-rc0-tag [created] 866e3f624 refs/tags/release-0.60.0-incubating-rc1-tag [created] f8effedf0 refs/tags/release-0.60.0-tag [created] b66e7444e refs/tags/release_slider_0.60-tag [created] 01818d5b2 refs/tags/slider-0.30-tag [created] decb8d120 refs/tags/slider-0.40-tag [created] de4aa330b refs/tags/slider-0.61.0-incubating-tag [created] d0fb9e1f3 refs/tags/slider-0.61.0-tag [created] 23fa563e4 refs/tags/tag-pre-release-0.61-tag [created] 68fa233d5 refs/tags/tag_2014_11_01_pre-SLIDER-531-merge-tag [created] 6ef24ade4 refs/tags/tag_2015-01-19-prerelease-0.61-tag [created] 6736385c2 refs/tags/tag_2015-01-26-prerelease-0.61-incubating-tag [created] db4828555
SLIDER-902 add config to client cert gen command Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/85b7620b Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/85b7620b Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/85b7620b Branch: refs/heads/develop Commit: 85b7620b3245561df186133960dde8b33eafbd82 Parents: 7a8f39f Author: Jon Maron <jma...@hortonworks.com> Authored: Tue Jun 16 20:56:04 2015 -0400 Committer: Jon Maron <jma...@hortonworks.com> Committed: Tue Jun 16 20:56:04 2015 -0400 ---------------------------------------------------------------------- .../slider/server/services/security/CertificateManager.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/85b7620b/slider-core/src/main/java/org/apache/slider/server/services/security/CertificateManager.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/services/security/CertificateManager.java b/slider-core/src/main/java/org/apache/slider/server/services/security/CertificateManager.java index 2cdcbec..e436ae9 100644 --- a/slider-core/src/main/java/org/apache/slider/server/services/security/CertificateManager.java +++ b/slider-core/src/main/java/org/apache/slider/server/services/security/CertificateManager.java @@ -65,7 +65,8 @@ public class CertificateManager { "-keyfile {0}" + File.separator + "{4} -cert {0}" + File.separator + "{5}"; private static final String GEN_AGENT_KEY="openssl req -new -newkey " + "rsa:1024 -nodes -keyout {0}" + File.separator + - "{2}.key -subj {1} -out {0}" + File.separator + "{2}.csr"; + "{2}.key -subj {1} -out {0}" + File.separator + "{2}.csr " + + "-config {3}" + File.separator + "ca.config "; private String passphrase; private String applicationName; @@ -208,7 +209,7 @@ public class CertificateManager { String srvrKstrDir = SecurityUtils.getSecurityDir(); Object[] scriptArgs = {srvrKstrDir, getSubjectDN(hostname, identifier, - this.applicationName), identifier}; + this.applicationName), identifier, SecurityUtils.getSecurityDir()}; try { String command = MessageFormat.format(GEN_AGENT_KEY, scriptArgs);
