From c97f44132a6a5589bb0cc3b57b7c68c46702bac2 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Fri, 14 Jun 2024 11:25:29 +0200 Subject: [PATCH 1/4] Update zss.apiml_static_reg.yaml.template Signed-off-by: 1000TurquoisePogs --- zss.apiml_static_reg.yaml.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zss.apiml_static_reg.yaml.template b/zss.apiml_static_reg.yaml.template index b8eedebb..576568f4 100644 --- a/zss.apiml_static_reg.yaml.template +++ b/zss.apiml_static_reg.yaml.template @@ -4,7 +4,7 @@ services: description: 'Zowe System Services is an HTTPS and Websocket server that makes it easy to have secure, powerful web APIs backed by low-level z/OS constructs. It contains services for essential z/OS abilities such as working with files, datasets, and ESMs, but is also extensible by REST and Websocket "Dataservices" which are optionally present in App Framework "Plugins".' catalogUiTileId: zss instanceBaseUrls: - - ${ZSS_PROTOCOL}://${ZWED_agent_host}:${ZSS_PORT}/ + - https://${ZWED_agent_host}:${ZSS_PORT}/ homePageRelativeUrl: routedServices: - gatewayUrl: api/v1 @@ -17,4 +17,4 @@ services: catalogUiTiles: zss: title: Zowe System Services (ZSS) - description: Zowe System Services is an HTTPS and Websocket server that makes it easy to have secure, powerful web APIs backed by low-level z/OS constructs. \ No newline at end of file + description: Zowe System Services is an HTTPS and Websocket server that makes it easy to have secure, powerful web APIs backed by low-level z/OS constructs. From 7904ce10fec12663e803780937b252d017e25c3e Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Fri, 14 Jun 2024 11:27:22 +0200 Subject: [PATCH 2/4] Remove conditional setup of https Signed-off-by: 1000TurquoisePogs --- bin/configure.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/bin/configure.sh b/bin/configure.sh index 499eaac1..6baada1e 100755 --- a/bin/configure.sh +++ b/bin/configure.sh @@ -28,11 +28,6 @@ if [ "$ZWE_components_gateway_enabled" = "true" ]; then if [ "${ZWE_RUN_ON_ZOS}" != "true" ]; then zss_def_template="zss.apiml_static_reg.yaml.template" export ZSS_PORT="${ZWE_components_zss_port}" - if [ "${ZWE_components_zss_tls}" != "false" ]; then - export ZSS_PROTOCOL=https - else - export ZSS_PROTOCOL=http - fi if [ -n "${ZWE_STATIC_DEFINITIONS_DIR}" ]; then zss_registration_yaml=${ZWE_STATIC_DEFINITIONS_DIR}/zss.apiml_static_reg_yaml_template.${ZWE_CLI_PARAMETER_HA_INSTANCE}.yml @@ -43,7 +38,6 @@ if [ "$ZWE_components_gateway_enabled" = "true" ]; then fi unset ZSS_PORT - unset ZSS_PROTOCOL fi fi fi From 535986f5defb35a657fd0f4f4d9c662ec87254bc Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Fri, 14 Jun 2024 11:28:32 +0200 Subject: [PATCH 3/4] Update CHANGELOG.md Signed-off-by: 1000TurquoisePogs --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 13c32faf..a751b02d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ All notable changes to the Zlux App Server package will be documented in this file. ## v2.17.0 -- Enhancement: app-server can now use Zowe's standardized and simplified AT-TLS configuration simply by toggling `zowe.network.server.tls.attls: true` or `components.app-server.zowe.network.server.tls.attls: true`. If you wish to control client tls separately from server tls, you can also use `zowe.network.client.tls.attls` or `components.app-server.zowe.network.client.tls.attls`. (#300) +- Enhancement: app-server can now use Zowe's standardized and simplified AT-TLS configuration simply by toggling `zowe.network.server.tls.attls: true` or `components.app-server.zowe.network.server.tls.attls: true`. If you wish to control client tls separately from server tls, you can also use `zowe.network.client.tls.attls` or `components.app-server.zowe.network.client.tls.attls`. (#300) (#302) ## v2.16.0 - Bugfix: Removed message saying node not found prior to discovery of node. Now, you will only get an error message if node is not found after lookup in NODE_HOME. From c474f27e0c8e148c455c2b7aad4d72c7694be85e Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Fri, 14 Jun 2024 11:37:31 +0200 Subject: [PATCH 4/4] Update CHANGELOG.md Signed-off-by: 1000TurquoisePogs --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a751b02d..c14492c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ All notable changes to the Zlux App Server package will be documented in this file. ## v2.17.0 -- Enhancement: app-server can now use Zowe's standardized and simplified AT-TLS configuration simply by toggling `zowe.network.server.tls.attls: true` or `components.app-server.zowe.network.server.tls.attls: true`. If you wish to control client tls separately from server tls, you can also use `zowe.network.client.tls.attls` or `components.app-server.zowe.network.client.tls.attls`. (#300) (#302) +- Enhancement: app-server can now use Zowe's standardized and simplified AT-TLS configuration simply by toggling `zowe.network.server.tls.attls: true` or `components.app-server.zowe.network.server.tls.attls: true`. If you wish to control client tls separately from server tls, you can also use `zowe.network.client.tls.attls` or `components.app-server.zowe.network.client.tls.attls`. (#300) (#303) ## v2.16.0 - Bugfix: Removed message saying node not found prior to discovery of node. Now, you will only get an error message if node is not found after lookup in NODE_HOME.