You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by we...@apache.org on 2013/07/11 16:08:40 UTC
[3/3] git commit: updated refs/heads/master to 521dcbd
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/521dcbdc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/521dcbdc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/521dcbdc
Branch: refs/heads/master
Commit: 521dcbdcc087515a67ad467f6c4b39f63c9390bc
Parents: 1a03024
Author: Wei Zhou <w....@leaseweb.com>
Authored: Thu Jul 11 16:08:26 2013 +0200
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Thu Jul 11 16:08:26 2013 +0200
----------------------------------------------------------------------
services/console-proxy/server/scripts/config_ssl.sh | 9 +++++++++
services/secondary-storage/scripts/config_ssl.sh | 9 +++++++++
2 files changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/521dcbdc/services/console-proxy/server/scripts/config_ssl.sh
----------------------------------------------------------------------
diff --git a/services/console-proxy/server/scripts/config_ssl.sh b/services/console-proxy/server/scripts/config_ssl.sh
index 8d80c47..e474787 100755
--- a/services/console-proxy/server/scripts/config_ssl.sh
+++ b/services/console-proxy/server/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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/521dcbdc/services/secondary-storage/scripts/config_ssl.sh
----------------------------------------------------------------------
diff --git a/services/secondary-storage/scripts/config_ssl.sh b/services/secondary-storage/scripts/config_ssl.sh
index 8d80c47..e474787 100755
--- a/services/secondary-storage/scripts/config_ssl.sh
+++ b/services/secondary-storage/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