diff --git a/CHANGELOG.md b/CHANGELOG.md index 10fc5c0b..cb5cb5cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to the Zlux App Server package will be documented in this file. +## v1.17.0 + +- Bugfix: make use of external certificate authorities referenced during keystore setup time + ## v1.16.0 - Bugfix: Changes to terminal settings in instance.env would not take effect post-install, causing the initial values to be permenent unless users set personalized settings diff --git a/bin/convert-env.sh b/bin/convert-env.sh index 23eca4e9..93d960ef 100755 --- a/bin/convert-env.sh +++ b/bin/convert-env.sh @@ -77,7 +77,12 @@ then elif [ -n "$KEYSTORE_CERTIFICATE_AUTHORITY" ] then #, at end turns it into an array - export ZWED_node_https_certificateAuthorities=${KEYSTORE_CERTIFICATE_AUTHORITY},${EXTERNAL_ROOT_CA} + if [ -n "$EXTERNAL_CERTIFICATE_AUTHORITIES" ] + then + export ZWED_node_https_certificateAuthorities=${KEYSTORE_CERTIFICATE_AUTHORITY},${EXTERNAL_ROOT_CA},$(echo "$EXTERNAL_CERTIFICATE_AUTHORITIES" | tr " " ",") + else + export ZWED_node_https_certificateAuthorities=${KEYSTORE_CERTIFICATE_AUTHORITY},${EXTERNAL_ROOT_CA}, + fi fi fi if [ -z "$ZWED_node_https_keys" ]