Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id E4F54200B29 for ; Thu, 26 May 2016 05:05:49 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id E3D1A160A3B; Thu, 26 May 2016 03:05:49 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 38031160A29 for ; Thu, 26 May 2016 05:05:49 +0200 (CEST) Received: (qmail 68036 invoked by uid 500); 26 May 2016 03:05:44 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 65201 invoked by uid 99); 26 May 2016 03:05:41 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 May 2016 03:05:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BEE3FEABE8; Thu, 26 May 2016 03:05:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: swill@apache.org To: commits@cloudstack.apache.org Date: Thu, 26 May 2016 03:06:04 -0000 Message-Id: In-Reply-To: <499c689eb98a479db368b0a82be15974@git.apache.org> References: <499c689eb98a479db368b0a82be15974@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [25/39] git commit: updated refs/heads/master to 3c800b4 archived-at: Thu, 26 May 2016 03:05:50 -0000 Add Java Default Certificat Authorities into the keystore if using a custom cert SSL Related to CLOUDSTACK-1475 Fix some english message Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d8767ec1 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d8767ec1 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d8767ec1 Branch: refs/heads/master Commit: d8767ec13e84b7b95c1c94c0669fc82cf48dfd08 Parents: 34111df Author: Milamber Authored: Fri May 20 09:20:12 2016 +0100 Committer: Milamber Committed: Wed May 25 06:34:15 2016 +0100 ---------------------------------------------------------------------- systemvm/scripts/config_ssl.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d8767ec1/systemvm/scripts/config_ssl.sh ---------------------------------------------------------------------- diff --git a/systemvm/scripts/config_ssl.sh b/systemvm/scripts/config_ssl.sh index 9dfb927..8635887 100755 --- a/systemvm/scripts/config_ssl.sh +++ b/systemvm/scripts/config_ssl.sh @@ -16,9 +16,6 @@ # specific language governing permissions and limitations # under the License. - - - help() { printf " -c use customized key/cert\n" printf " -k path of private key\n" @@ -123,6 +120,8 @@ customCACert= publicIp= hostName= keyStore=$(dirname $0)/certs/realhostip.keystore +defaultJavaKeyStoreFile=/etc/ssl/certs/java/cacerts +defaultJavaKeyStorePass="changeit" aliasName="CPVMCertificate" storepass="vmops.com" while getopts 'i:h:k:p:t:u:c' OPTION @@ -167,13 +166,13 @@ then fi if [ ! -f "$customPrivKey" ] then - printf "priviate key file is not exist\n" + printf "private key file does not exist\n" exit 2 fi if [ ! -f "$customPrivCert" ] then - printf "public certificate is not exist\n" + printf "public certificate does not exist\n" exit 3 fi @@ -181,7 +180,7 @@ then then if [ ! -f "$customCertChain" ] then - printf "certificate chain is not exist\n" + printf "certificate chain does not exist\n" exit 4 fi fi @@ -204,6 +203,7 @@ if [ -f "$customCACert" ] then keytool -delete -alias $aliasName -keystore $keyStore -storepass $storepass -noprompt keytool -import -alias $aliasName -keystore $keyStore -storepass $storepass -noprompt -file $customCACert + keytool -importkeystore -srckeystore $defaultJavaKeyStoreFile -destkeystore $keyStore -srcstorepass $defaultJavaKeyStorePass -deststorepass $storepass -noprompt fi if [ -d /etc/apache2 ]