Merge pull request #234 from zowe/bugfix/v2/keyring-root-ca

Update convert-env.sh to fix keyring root ca
zowe · Jul 12, 2022 · de183f6 · de183f6
2 parents cc5ff74 + 18df72b
commit de183f6
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/bin/utils/convert-env.sh b/bin/utils/convert-env.sh
@@ -187,16 +187,12 @@ if [ -z "$ZWED_node_https_certificateAuthorities" ]
 then
   if [ "$KEYSTORE_TYPE" = "JCERACFKS" ]
   then
-    if [ -z "$LOCAL_CA" ]
-    then
-      LOCAL_CA=localca
-    fi
     #, at end turns it into an array
     if [ -n "$EXTERNAL_ROOT_CA" ]
     then
-      export ZWED_node_https_certificateAuthorities="${TRUSTSTORE}&${LOCAL_CA}","${TRUSTSTORE}&${EXTERNAL_ROOT_CA}"
+      export ZWED_node_https_certificateAuthorities="${ZWE_zowe_certificate_pem_certificateAuthorities}","${TRUSTSTORE}&${EXTERNAL_ROOT_CA}"
     else
-      export ZWED_node_https_certificateAuthorities="${TRUSTSTORE}&${LOCAL_CA}",
+      export ZWED_node_https_certificateAuthorities="${ZWE_zowe_certificate_pem_certificateAuthorities}",
     fi
   elif [ -n "$KEYSTORE_CERTIFICATE_AUTHORITY" ]
   then