-
Notifications
You must be signed in to change notification settings - Fork 51
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add global and component level network configuration options #3509
Merged
+87
−14
Merged
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
ba958a1
Add global and component level network configuration options
timgerstel 1fb66ad
Use zoweIpv4 for bind addresses and update tls settings to enums
timgerstel d01b726
Merge branch 'v2.x/staging' into schema/network/https
timgerstel ee94623
Merge branch 'v2.x/staging' into schema/network/https
timgerstel a2a3d52
Deduplicate schema and separate server from client
1000TurquoisePogs f984e95
Fix schema json syntax
1000TurquoisePogs 89487c8
Shorten tlsSettings to tls, and fix plural ipAddresses
1000TurquoisePogs e40dc55
Merge branch 'v2.x/staging' into schema/network/https
1000TurquoisePogs File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -423,6 +423,35 @@ | |
"additionalProperties": false, | ||
"description": "Optional, advanced network configuration parameters", | ||
"properties": { | ||
"bind": { | ||
"type": "array", | ||
"description": "The IP addresses which all of the Zowe servers will be binding to.", | ||
"items": { | ||
"type": "string" | ||
} | ||
}, | ||
"ciphers": { | ||
"type": "array", | ||
"description": "Acceptable TLS cipher suites for network connections.", | ||
"items": { | ||
"type": "string" | ||
} | ||
}, | ||
"curves": { | ||
"type": "array", | ||
"description": "Acceptable key exchange elliptic curves for network connections.", | ||
"items": { | ||
"type": "string" | ||
} | ||
}, | ||
"maxTls": { | ||
"type": "string", | ||
"description": "Maximum TLS version allowed for network connections. Must be: 1.0, 1.1, 1.2, or 1.3." | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. if it 'must be' anything, make it an enum. |
||
}, | ||
"minTls": { | ||
"type": "string", | ||
"description": "Minimum TLS version allowed for network connections. Must be: 1.0, 1.1, 1.2, or 1.3." | ||
}, | ||
"vipaIp": { | ||
"type": "string", | ||
"description": "The IP address which all of the Zowe servers will be binding to. If you are using multiple DIPVA addresses, do not use this option." | ||
|
@@ -842,6 +871,49 @@ | |
"default": "yes" | ||
} | ||
} | ||
}, | ||
"zowe": { | ||
"type": "object", | ||
"description": "Component level overrides for top level Zowe network configuration.", | ||
"additionalProperties": false, | ||
"properties": { | ||
"network": { | ||
"type": "object", | ||
"additionalProperties": false, | ||
"description": "Optional, advanced network configuration parameters", | ||
"properties": { | ||
"bind": { | ||
"type": "array", | ||
"description": "The IP addresses which all of the Zowe servers will be binding to.", | ||
"items": { | ||
"type": "string" | ||
} | ||
}, | ||
"ciphers": { | ||
"type": "array", | ||
"description": "Acceptable TLS cipher suites for network connections.", | ||
"items": { | ||
"type": "string" | ||
} | ||
}, | ||
"curves": { | ||
"type": "array", | ||
"description": "Acceptable key exchange elliptic curves for network connections.", | ||
"items": { | ||
"type": "string" | ||
} | ||
}, | ||
"maxTls": { | ||
"type": "string", | ||
"description": "Maximum TLS version allowed for network connections. Must be: 1.0, 1.1, 1.2, or 1.3." | ||
}, | ||
"minTls": { | ||
"type": "string", | ||
"description": "Minimum TLS version allowed for network connections. Must be: 1.0, 1.1, 1.2, or 1.3." | ||
} | ||
} | ||
} | ||
} | ||
} | ||
} | ||
}, | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
dont make it a string. cant do good validation on that.
use this: https://github.com/zowe/zowe-install-packaging/blob/v2.x/staging/schemas/server-common.json#L78
and we should have an ipv6 one too, even though we dont support ipv6 yet...