cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From weiz...@apache.org
Subject [4/4] git commit: updated refs/heads/4.1 to 3b5bcac
Date Fri, 12 Jul 2013 09:35:52 GMT
CLOUDSTACK-1475: fix RegisterISO error after Update SSL Certificate


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3b5bcac8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3b5bcac8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3b5bcac8

Branch: refs/heads/4.1
Commit: 3b5bcac81a14aa239e172f14f1819bd445063a6a
Parents: 2963f04
Author: Wei Zhou <w.zhou@leaseweb.com>
Authored: Thu Jul 11 16:08:26 2013 +0200
Committer: Wei Zhou <w.zhou@leaseweb.com>
Committed: Fri Jul 12 11:35:15 2013 +0200

----------------------------------------------------------------------
 console-proxy/scripts/config_ssl.sh | 9 +++++++++
 1 file changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3b5bcac8/console-proxy/scripts/config_ssl.sh
----------------------------------------------------------------------
diff --git a/console-proxy/scripts/config_ssl.sh b/console-proxy/scripts/config_ssl.sh
index 8d80c47..e474787 100755
--- a/console-proxy/scripts/config_ssl.sh
+++ b/console-proxy/scripts/config_ssl.sh
@@ -90,6 +90,9 @@ customPrivCert=$(dirname $0)/certs/realhostip.crt
 customCertChain=
 publicIp=
 hostName=
+keyStore=$(dirname $0)/certs/realhostip.keystore
+aliasName="CPVMCertificate"
+storepass="vmops.com"
 while getopts 'i:h:k:p:t:c' OPTION
 do
   case $OPTION in
@@ -162,6 +165,12 @@ then
   exit 2
 fi
 
+if [ -f "$customPrivCert" ]
+then
+  keytool -delete -alias $aliasName -keystore $keyStore -storepass $storepass -noprompt
+  keytool -import -alias $aliasName -keystore $keyStore -storepass $storepass -noprompt -file
$customPrivCert
+fi
+
 if [ -d /etc/apache2 ]
 then
   config_apache2_conf $publicIp $hostName


Mime
View raw message