From 8b0308ad895d69a0da761b496947920a54e329f6 Mon Sep 17 00:00:00 2001 From: Timothy Gerstel Date: Thu, 15 Oct 2020 14:04:23 -0400 Subject: [PATCH 1/6] Remove unused vars, export external_certificate_authorities to env file so that app server may make use of it Signed-off-by: Timothy Gerstel --- bin/zowe-setup-certificates.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/zowe-setup-certificates.sh b/bin/zowe-setup-certificates.sh index ec8c448a52..82175cd32f 100644 --- a/bin/zowe-setup-certificates.sh +++ b/bin/zowe-setup-certificates.sh @@ -298,8 +298,8 @@ if [[ -z "${ZOWE_KEYRING}" ]]; then KEYSTORE_CERTIFICATE=${KEYSTORE_PREFIX}.cer-ebcdic KEYSTORE_CERTIFICATE_AUTHORITY=${LOCAL_CA_PREFIX}.cer-ebcdic EXTERNAL_ROOT_CA=${EXTERNAL_ROOT_CA} + EXTERNAL_CERTIFICATE_AUTHORITIES=${EXTERNAL_CERTIFICATE_AUTHORITIES} ZOWE_APIM_VERIFY_CERTIFICATES=${VERIFY_CERTIFICATES} - SETUP_APIML_SSO=${SETUP_APIML_SSO} SSO_FALLBACK_TO_NATIVE_AUTH=${SSO_FALLBACK_TO_NATIVE_AUTH} PKCS11_TOKEN_NAME=${PKCS11_TOKEN_NAME} PKCS11_TOKEN_LABEL=${UPPER_KEY_LABEL} @@ -314,8 +314,8 @@ else KEYSTORE_TYPE="JCERACFKS" TRUSTSTORE="safkeyring:////\${KEYRING_OWNER}/\${KEYRING_NAME}" EXTERNAL_ROOT_CA=${EXTERNAL_ROOT_CA} + EXTERNAL_CERTIFICATE_AUTHORITIES=${EXTERNAL_CERTIFICATE_AUTHORITIES} ZOWE_APIM_VERIFY_CERTIFICATES=${VERIFY_CERTIFICATES} - SETUP_APIML_SSO=${SETUP_APIML_SSO} SSO_FALLBACK_TO_NATIVE_AUTH=${SSO_FALLBACK_TO_NATIVE_AUTH} PKCS11_TOKEN_NAME=${PKCS11_TOKEN_NAME} PKCS11_TOKEN_LABEL=${UPPER_KEY_LABEL} From bc6793955dcb218b8b8753a57d6edbf690034fba Mon Sep 17 00:00:00 2001 From: Timothy Gerstel Date: Thu, 15 Oct 2020 23:57:28 -0400 Subject: [PATCH 2/6] Update manifest for testing Signed-off-by: Timothy Gerstel --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index f5583f5557..20de249d93 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -12,7 +12,7 @@ }, "binaryDependencies": { "org.zowe.zlux.zlux-core": { - "version": "~1.16.0-STAGING", + "version": "~1.17.0-S-S-138-S-S-S", "artifact": "*.pax" }, "org.zowe.zlux.zss-auth": { From a0668773c10cad417b700ab3244faeede38e2944 Mon Sep 17 00:00:00 2001 From: Timothy Gerstel Date: Wed, 21 Oct 2020 11:23:41 -0400 Subject: [PATCH 3/6] For testing Signed-off-by: Timothy Gerstel --- manifest.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json.template b/manifest.json.template index 20de249d93..8828f9765a 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -12,7 +12,7 @@ }, "binaryDependencies": { "org.zowe.zlux.zlux-core": { - "version": "~1.17.0-S-S-138-S-S-S", + "version": "~1.17.0-254-S-138-S-S-S", "artifact": "*.pax" }, "org.zowe.zlux.zss-auth": { From 514ee3090913dac193a427b34b292d412fd106e4 Mon Sep 17 00:00:00 2001 From: Timothy Gerstel Date: Wed, 21 Oct 2020 15:39:07 -0400 Subject: [PATCH 4/6] For testing Signed-off-by: Timothy Gerstel --- manifest.json.template | 1 + 1 file changed, 1 insertion(+) diff --git a/manifest.json.template b/manifest.json.template index 8828f9765a..602ea44510 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -375,3 +375,4 @@ "rel": ".dependency/doc/dependency_decisions.yml" } } + From e0fe70d18dd7226b0d886d2f99a7ce3cde44a4c6 Mon Sep 17 00:00:00 2001 From: Timothy Gerstel Date: Wed, 21 Oct 2020 17:20:58 -0400 Subject: [PATCH 5/6] Restore manifest Signed-off-by: Timothy Gerstel --- manifest.json.template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/manifest.json.template b/manifest.json.template index 602ea44510..f5583f5557 100644 --- a/manifest.json.template +++ b/manifest.json.template @@ -12,7 +12,7 @@ }, "binaryDependencies": { "org.zowe.zlux.zlux-core": { - "version": "~1.17.0-254-S-138-S-S-S", + "version": "~1.16.0-STAGING", "artifact": "*.pax" }, "org.zowe.zlux.zss-auth": { @@ -375,4 +375,3 @@ "rel": ".dependency/doc/dependency_decisions.yml" } } - From c97ffa8c0b4302929489a396fffc99ff3d795d9f Mon Sep 17 00:00:00 2001 From: Timothy Gerstel Date: Thu, 22 Oct 2020 09:00:36 -0400 Subject: [PATCH 6/6] Update changelog Signed-off-by: Timothy Gerstel --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8598c619af..9b4a95d504 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ All notable changes to the Zowe Installer will be documented in this file. - ZSS can now be started completely independent from the Application Framework server by specifying the LAUNCH_COMPONENT_GROUP "ZSS". If not specified but DESKTOP is, zss will still be included as a prereq to app-server. - Zowe Instance Configuration script (zowe-configure-instance.sh) can now skip checking for node by passing in the -s flag since node may not needed if the launch components don't require node - run-zowe.sh can also skip the checking for node by settting the environment variable SKIP_NODE=1 for the cases where the launch components specified don't require node +- Export "EXTERNAL_CERTIFICATE_AUTHORITIES" variable to zowe-certificates.env such that it may be used by the app-server. ## `1.16.0`