hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.3' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2019-03-05 10:37:56 +02:00
parent 83fc3b1bc2 6332f0876b
commit 9572ff84ea
32 changed files with 948 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
maxctrl/lib/alter.js
View File

@ -93,7 +93,10 @@ exports.builder = function(yargs) {
})
.command('service <service> <key> <value>', 'Alter service parameters', function(yargs) {
return yargs.epilog('To display the service parameters, execute `show service <service>`. ' +
'The following list of parameters can be altered at runtime:\n\n' + JSON.stringify(service_params, null, 4))
'Some routers support runtime configuration changes to all parameters. ' +
'Currently all readconnroute, readwritesplit and schemarouter parameters ' +
'can be changed at runtime. In addition to module specific parameters, ' +
'the following list of common service parameters can be altered at runtime:\n\n' + JSON.stringify(service_params, null, 4))
.usage('Usage: alter service <service> <key> <value>')
}, function(argv) {
maxctrl(argv, function(host) {

5
maxctrl/lib/core.js
View File

@ -65,7 +65,7 @@ program
default: false,
type: 'boolean'
})
.group(['s', 'tls-key', 'tls-cert', 'tls-ca-cert', 'tls-verify-server-cert'], 'HTTPS/TLS Options:')
.group(['s', 'tls-key', 'tls-passphrase', 'tls-cert', 'tls-ca-cert', 'n'], 'HTTPS/TLS Options:')
.option('s', {
alias: 'secure',
describe: 'Enable HTTPS requests',
@ -88,7 +88,8 @@ program
describe: 'Path to TLS CA certificate',
type: 'string'
})
.option('tls-verify-server-cert', {
.option('n', {
alias: 'tls-verify-server-cert',
describe: 'Whether to verify server TLS certificates',
default: true,
type: 'boolean'