Skip to content

Commit

Permalink
Merge branch 'master' into anax-test-branch
Browse files Browse the repository at this point in the history
  • Loading branch information
anaxceron authored Dec 13, 2023
2 parents 2617e96 + 4b20c63 commit 28871d3
Show file tree
Hide file tree
Showing 8 changed files with 130 additions and 62 deletions.
3 changes: 3 additions & 0 deletions .github/dco.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
allowRemediationCommits:
individual: true
thirdParty: true
3 changes: 3 additions & 0 deletions dco_signoffs/Lobhas-Paradkar-docs-site.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
I, Lobhas Paradkar, hereby sign-off-by all of my past commits to this repo subject to the Developer Certificate of Origin (DCO), Version 1.1.
In the past I have used email: [email protected]
41febb79fe07ae4670a746301b7215740e65a3c7 updated release notes 2.12 (#3203)
3 changes: 3 additions & 0 deletions dco_signoffs/Sergei-Kurnevich-docs-site.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
I, Sergei Kurnevich, hereby sign-off-by all of my past commits to this repo subject to the Developer Certificate of Origin (DCO), Version 1.1. In the past I have used emails: [email protected]

3b9ecfb727b8b0081cea8a3a395d278c1c26de42 ZIS load module typo fix (#3258)
6 changes: 6 additions & 0 deletions dco_signoffs/Wen-Ting-Su-docs-site.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
I, Wen Ting Su, hereby sign-off-by all of my past commits to this repo subject to the Developer Certificate of Origin (DCO), Version 1.1. In the past I have used emails: [email protected]
c2d5e239df7013223e5f52f1b8ac41a345891967 Update certificate-configuration-scenarios.md (#3189)
98a73862bbf28cea7ba227a4482030437729c228 Update zowe-security-authentication.md (#3149)
624fddc413f15bd35acfda827ff6dc16fb75ece9 Adjust the advanced config section (#3216)
b07fd2c678379338bf03a691eef2c1588176c679 Add an overall flowchart to the beginning of the containerization installation chapter (#3237)
277e136947f50d0703cd7e033fb07de17db35769 typo fix (#3256)
130 changes: 78 additions & 52 deletions docs/extend/extend-apiml/authentication-for-apiml-services.md

Large diffs are not rendered by default.

25 changes: 24 additions & 1 deletion docs/troubleshoot/launcher/launcher-error-codes.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,4 +115,27 @@ The following error message codes may appear on Zowe Launcher SYSPRINT. Use the

**Action:**

Validate the format of Zowe configuration file. It should be a valid YAML file following specifications defined in https://yaml.org/.
Validate the format of Zowe configuration file. It should be a valid YAML file following specifications defined in https://yaml.org/.

### ZWEL0073E

Launcher Could not load schemas, status=5

**Reason:**

The Zowe Launcher was able to locate the runtime directory, but unable to find the /schemas directory.

**Action:**

Locate the runtimeDirectory from the `zowe.yaml` variable `runtimeDirectory: "<PATH_TO_RUNTIME>"`.

Check that there is a `<PATH_TO_RUNTIME>/schemas` directory. This should contain four `.json` files shown below.

```
manifest-schema.json
server-common-json
trivial-component-schema.json
zowe-yaml-schema.json
```

On ocassion the error occurs because the `runtimeDirectory` is pointing to a valid directory, but one which doesn't contain a valid Zowe runtime environment is one of the first failures during a Zowe launch.
10 changes: 5 additions & 5 deletions docs/user-guide/certificate-configuration-scenarios.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Ensure that all alias values for all scenarios use only lower-case.

## Scenario 1: Use a file-based (PKCS12) keystore with Zowe generated certificates

Use the following procedure to configure your yaml file to enable Zowe to use generated PKCS12 certificates to be used with a keystore directory to store your certificates.
Use the following procedure to configure the `zowe.setup` section in your yaml file to enable Zowe to use generated PKCS12 certificates to be used with a keystore directory to store your certificates.

1. Set the `type` of the certificate storage to `PKCS12`.

Expand Down Expand Up @@ -133,7 +133,7 @@ Check out the [video tutorials](https://www.youtube.com/playlist?list=PL8REpLGaY
## Scenario 2: Use a file-based (PKCS12) keystore and import a certificate generated by another CA
Use the following procedure to configure your yaml file to enable Zowe to use a file-based PKCS12 keystore to import a certificate generted by another CA.
Use the following procedure to configure the `zowe.setup` section in your yaml file to enable Zowe to use a file-based PKCS12 keystore to import a certificate generted by another CA.
1. Set the `type` of the certificate storage to `PKCS12`.
Expand Down Expand Up @@ -191,7 +191,7 @@ PEM format certificate authorities can be imported and trusted.
```
Your yaml file is now configured to enable Zowe to use a file-based PKCS12 keystore to import a certificate generted by another CA.
## Scenario 3: Use a z/OS keyring-based keystore with Zowe generated certificates
Use the following procedure to configure your yaml file to enable Zowe to use a z/OS keyring-based keystore with Zowe generated certificates.
Use the following procedure to configure the `zowe.setup` section in your yaml file to enable Zowe to use a z/OS keyring-based keystore with Zowe generated certificates.
1. Set the `type` of the certificate storage to one of the following keyring types:
Expand Down Expand Up @@ -269,7 +269,7 @@ Due to the limitation of the `RACDCERT` command, this field should contain exact
Your yaml file is now configured to enable Zowe to use a z/OS keyring-based keystore with Zowe generated certificates.
## Scenario 4: Use a z/OS keyring-based keystore and connect to an existing certificate
Use the following procedure to configure your yaml file to use a z/OS keyring-based keystore and connect to an existing certificate.
Use the following procedure to configure the `zowe.setup` section in your yaml file to use a z/OS keyring-based keystore and connect to an existing certificate.
1. Set the `type` of the certificate storage to one of the following keyring types:
Expand Down Expand Up @@ -329,7 +329,7 @@ If you would like to use this example in your Zowe configuration YAML file, repl
Your yaml file is now configured to use a z/OS keyring-based keystore and connect to an existing certificate.
## Scenario 5: Use a z/OS keyring-based keystore and import a certificate stored in a data set
Use the following procedure to configure your yaml file to use a z/OS keyring-based keystore and import a certificate stored in a data set.
Use the following procedure to configure the `zowe.setup` section in your yaml file to use a z/OS keyring-based keystore and import a certificate stored in a data set.
1. Set the `type` of the certificate storage to one of the following keyring types:
Expand Down
12 changes: 8 additions & 4 deletions docs/user-guide/cli-using-formatting-environment-variables.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,17 @@ Transform an option into the proper format for a Zowe CLI environment variable,
* Convert lowercase letters in arguments/options to uppercase letters.
* Convert hyphens in arguments/options to underscores.

**Tip:** Refer to your operating system documentation for information about how to set and get environment variables. The procedure varies between Windows, Mac, and various versions of Linux.
:::tip
Refer to your operating system documentation for information about how to set and get environment variables. The procedure varies between Windows, Mac, and various versions of Linux.
:::

**Examples:**
## Examples of transformed CLI options

The following table provides examples of CLI options and the corresponding environment variable to which you can define a value:

| Command Option | Environment Variable | Use Case |
| ----------------------- | ------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------ |
| -------------------------- | ------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------ |
| `--user` | `ZOWE_OPT_USER` | Define your mainframe username to an environment variable to avoid specifying it on all commands or profiles. |
| `--reject-unauthorized` | `ZOWE_OPT_REJECT_UNAUTHORIZED` | Define a value of `true` to the `--reject-unauthorized` flag when you always require the flag and do not want to specify it on all commands or profiles. |
| `--reject-unauthorized` | `ZOWE_OPT_REJECT_UNAUTHORIZED` | Define a value of `true` to the `--reject-unauthorized` flag when you always require the flag and do not want to specify it on all commands or profiles. |
| `--editor` | `ZOWE_OPT_EDITOR` | Define an editor that Zowe CLI uses to open files. The value can be either the editor's executable file location or the name of a program (for example, *notepad* on Windows or *nano* on Linux).|

0 comments on commit 28871d3

Please sign in to comment.