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

Merge branch '2.1' into 2.2

Browse Source
This commit is contained in:
Markus Mäkelä
2018-06-13 23:15:11 +03:00
parent 143882ddce 53177c30de
commit 315738f279
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/modules/routing/debugcli/debugcmd.c
View File

@ -1219,10 +1219,11 @@ struct subcommand createoptions[] =
} }
}, },
{ {
"listener", 2, 12, createListener, "listener", 2, 13, createListener,
"Create a new listener for a service", "Create a new listener for a service",
"Usage: create listener SERVICE NAME [HOST] [PORT] [PROTOCOL] [AUTHENTICATOR] [OPTIONS]\n" "Usage: create listener SERVICE NAME [HOST] [PORT] [PROTOCOL] [AUTHENTICATOR] [OPTIONS]\n"
" [SSL_KEY] [SSL_CERT] [SSL_CA] [SSL_VERSION] [SSL_VERIFY_DEPTH]\n" " [SSL_KEY] [SSL_CERT] [SSL_CA] [SSL_VERSION] [SSL_VERIFY_DEPTH]\n"
" [SSL_VERIFY_PEER_CERTIFICATE]\n"
"\n" "\n"
"Parameters\n" "Parameters\n"
"SERVICE Service where this listener is added\n" "SERVICE Service where this listener is added\n"
@ -1237,6 +1238,7 @@ struct subcommand createoptions[] =
"SSL_CA Path to CA certificate\n" "SSL_CA Path to CA certificate\n"
"SSL_VERSION SSL version (default MAX)\n" "SSL_VERSION SSL version (default MAX)\n"
"SSL_VERIFY_DEPTH Certificate verification depth\n" "SSL_VERIFY_DEPTH Certificate verification depth\n"
"SSL_VERIFY_PEER_CERTIFICATE Verify peer certificate\n"
"\n" "\n"
"The first two parameters are required, the others are optional.\n" "The first two parameters are required, the others are optional.\n"
"Any of the optional parameters can also have the value 'default'\n" "Any of the optional parameters can also have the value 'default'\n"
@ -1248,6 +1250,7 @@ struct subcommand createoptions[] =
ARG_TYPE_OBJECT_NAME, ARG_TYPE_OBJECT_NAME, ARG_TYPE_OBJECT_NAME, ARG_TYPE_OBJECT_NAME, ARG_TYPE_OBJECT_NAME, ARG_TYPE_OBJECT_NAME,
ARG_TYPE_STRING, // Rest of the arguments are paths which can contain spaces ARG_TYPE_STRING, // Rest of the arguments are paths which can contain spaces
ARG_TYPE_STRING, ARG_TYPE_STRING, ARG_TYPE_STRING, ARG_TYPE_STRING, ARG_TYPE_STRING, ARG_TYPE_STRING, ARG_TYPE_STRING, ARG_TYPE_STRING,
ARG_TYPE_STRING,
} }
}, },
{ {
@ -1572,7 +1575,8 @@ struct subcommand alteroptions[] =
{ {
ARG_TYPE_SERVER, ARG_TYPE_STRING, ARG_TYPE_STRING, ARG_TYPE_STRING, ARG_TYPE_SERVER, ARG_TYPE_STRING, ARG_TYPE_STRING, ARG_TYPE_STRING,
ARG_TYPE_STRING, ARG_TYPE_STRING, ARG_TYPE_STRING, ARG_TYPE_STRING, ARG_TYPE_STRING, ARG_TYPE_STRING, ARG_TYPE_STRING, ARG_TYPE_STRING,
ARG_TYPE_STRING, ARG_TYPE_STRING, ARG_TYPE_STRING, ARG_TYPE_STRING ARG_TYPE_STRING, ARG_TYPE_STRING, ARG_TYPE_STRING, ARG_TYPE_STRING,
ARG_TYPE_STRING, ARG_TYPE_STRING
} }
}, },
{ {