From c96bb6d16907938e34c0464e9f76f76d695ed53e Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Fri, 7 Feb 2025 13:59:07 -0500 Subject: [PATCH] avoid https port getting removed when https customized, fix attls detection Signed-off-by: 1000TurquoisePogs --- defaults/serverConfig/defaults.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/defaults/serverConfig/defaults.yaml b/defaults/serverConfig/defaults.yaml index 6c114753..08309569 100644 --- a/defaults/serverConfig/defaults.yaml +++ b/defaults/serverConfig/defaults.yaml @@ -185,8 +185,9 @@ components: zss: # section used to define a connection to a server that can handle native or high privilege commands that the app server cannot agent: - http: "${{ function a(){ if (components.zss.tls == false && components.zss.port) { return { port: components.zss.port }; } else { return undefined; } }; a() }}" - https: "${{ function a(){ if (components.zss.tls != false && components.zss.port) { return { port: components.zss.port }; } else { return undefined; } }; a() }}" + http: "${{ function a(){ if ((components.zss.tls == false) || (components.zss.zowe?.network?.server?.tls?.attls == true) || ((components.zss.zowe?.network?.server?.tls?.attls == undefined) && (zowe.network.server.tls.attls == true))) && components.zss.port) { return { port: components.zss.port }; } else { return undefined; } }; a() }}" + https: + port: "${{ function a(){ if ((components.zss.tls != false) || (components.zss.zowe?.network?.server?.tls?.attls == false) || ((components.zss.zowe?.network?.server?.tls?.attls == undefined) && (zowe.network.server.tls.attls != true))) && components.zss.port) { return components.zss.port; } else { return undefined; } }; a() }}" host: "${{ function a(){ if (components.zss.tls != false && process.env.ZWE_haInstance_hostname) { return process.env.ZWE_haInstance_hostname; } }; a() }}" mediationLayer: enabled: "${{ components['app-server'].node.mediationLayer.enabled }}"