apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

systemvmtemplate: Fixes #2541 adds Letsencrypt CA cert

Browse Source 
On patching, the global cacerts keystore is imported in 'cloud' service
specific local keystore. This fixes #2541.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2018-05-01 15:01:11 +05:30 committed by Rohit Yadav
parent eb75c1eff5
commit ddc8d131c0
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
systemvm/debian/opt/cloud/bin/setup/patchsystemvm.sh
View File

@ -37,6 +37,8 @@ patch_systemvm() {
echo "Restored keystore file and certs using backup" >> $logfile echo "Restored keystore file and certs using backup" >> $logfile
fi fi
rm -fr $backupfolder rm -fr $backupfolder
# Import global cacerts into 'cloud' service's keystore
keytool -importkeystore -srckeystore /etc/ssl/certs/java/cacerts -destkeystore /usr/local/cloud/systemvm/certs/realhostip.keystore -srcstorepass changeit -deststorepass vmops.com -noprompt || true
return 0 return 0
} }

13
tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh
View File

@ -19,7 +19,7 @@
set -e set -e
set -x set -x
CLOUDSTACK_RELEASE=4.11.0 CLOUDSTACK_RELEASE=4.11.1
function configure_apache2() { function configure_apache2() {
# Enable ssl, rewrite and auth # Enable ssl, rewrite and auth
@ -31,6 +31,16 @@ function configure_apache2() {
sed -i 's/SSLProtocol .*$/SSLProtocol TLSv1.2/g' /etc/apache2/mods-available/ssl.conf sed -i 's/SSLProtocol .*$/SSLProtocol TLSv1.2/g' /etc/apache2/mods-available/ssl.conf
} }
function configure_cacerts() {
CDIR=$(pwd)
cd /tmp
# Add LetsEncrypt ca-cert
wget https://letsencrypt.org/certs/lets-encrypt-x3-cross-signed.der
keytool -trustcacerts -keystore /etc/ssl/certs/java/cacerts -storepass changeit -noprompt -importcert -alias letsencryptauthorityx3cross -file lets-encrypt-x3-cross-signed.der
rm -f lets-encrypt-x3-cross-signed.der
cd $CDIR
}
function install_cloud_scripts() { function install_cloud_scripts() {
# ./cloud_scripts/ has been put there by ../../cloud_scripts_shar_archive.sh # ./cloud_scripts/ has been put there by ../../cloud_scripts_shar_archive.sh
rsync -av ./cloud_scripts/ / rsync -av ./cloud_scripts/ /
@ -102,6 +112,7 @@ function configure_services() {
configure_apache2 configure_apache2
configure_strongswan configure_strongswan
configure_issue configure_issue
configure_cacerts
} }
return 2>/dev/null || configure_services return 2>/dev/null || configure_services