Skip to content

Commit

Permalink
Merge branch 'v2.x/staging' into user/muzikovam/workflowsCheck-v2
Browse files Browse the repository at this point in the history
  • Loading branch information
MarkAckert authored Dec 4, 2024
2 parents cee2ee0 + 009e1ce commit ac5d26b
Show file tree
Hide file tree
Showing 5 changed files with 76 additions and 81 deletions.
2 changes: 1 addition & 1 deletion bin/libs/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ export function getZoweRuntimeManifest(): any|undefined {
if (!runtimeManifest) {
const manifestFileName = `${std.getenv('ZWE_zowe_runtimeDirectory')}/manifest.json`;
const result = xplatform.loadFileUTF8(manifestFileName,xplatform.AUTO_DETECT);
if (result){
if (!result){
printError('Could not read runtime manifest in '+manifestFileName);
} else {
runtimeManifest=JSON.parse(result);
Expand Down
12 changes: 6 additions & 6 deletions example-zowe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ zowe:
# MVS data set related configurations
dataset:
# **COMMONLY_CUSTOMIZED**
# where Zowe MVS data sets will be installed
# where are existing Zowe SZWEEXEC Target libraries
prefix: IBMUSER.ZWEV2
# **COMMONLY_CUSTOMIZED**
# PROCLIB where Zowe STCs will be copied over
Expand Down Expand Up @@ -469,17 +469,17 @@ java:


#-------------------------------------------------------------------------------
# node.js configuration
# Node.js configuration
#
# Some Zowe components requires node.js. Define the path where you have your
# node.js is installed.
# Some Zowe components requires Node.js. Define the path where you have your
# Node.js is installed.
#
# **NOTE**: this field can be updated automatically if you pass `--update-config`
# to `zwe init` command.
#-------------------------------------------------------------------------------
node:
# **COMMONLY_CUSTOMIZED**
# Path to your node.js home directory
# Path to your Node.js home directory
home: ""


Expand Down Expand Up @@ -667,7 +667,7 @@ components:
# # for this HA instance, we did not customize "components", so it will use default value.

# # HA instance ID, we will start 2 instances on LPAR2
# # **NOTE**, we can only start one gateway in same LPAR.
# # **NOTE**, we can only start one Gateway in same LPAR.
# lpar2a:
# # hostname where this instance will be started
# hostname: lpar2.my-company.com
Expand Down
4 changes: 2 additions & 2 deletions workflows/files/ZWECONF.properties
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,10 @@ zowe_job_prefix=ZWE1

# zowe_externalDomains
# Label: Zowe external domains
# Abstract: This should be the domain name of your Dynamic VIP Address (DVIPA)
# Abstract: The list of external domains
# Category: zowe
# Description:
# This should be the domain name of your Dynamic VIP Address (DVIPA)
# Defines a list of external domains that will be used by the Zowe instance.
zowe_externalDomains=sample-domain.com

# zowe_externalPort
Expand Down
Loading

0 comments on commit ac5d26b

Please sign in to comment.