tyler.durden
/
PyKMIP
mirror of https://github.com/OpenKMIP/PyKMIP.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #219 from OpenKMIP/bug/fix-server-config-override 

Fixes configuration settings override by default script values
This commit is contained in:
Peter Hamilton 2016-12-01 12:34:36 -05:00 committed by GitHub
parent 5c50ec73fe 38e7635fc7
commit cba8757f63
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
kmip/services/server/server.py
View File

@ -367,12 +367,12 @@ def build_argument_parser():
"--hostname", "--hostname",
action="store", action="store",
type="str", type="str",
default="127.0.0.1", default=None,
dest="hostname", dest="hostname",
help=( help=(
"The host address the server will be bound to. A string " "The host address the server will be bound to. A string "
"representing either a hostname in Internet domain notation or " "representing either a hostname in Internet domain notation or "
"an IPv4 address. Defaults to '127.0.0.1'." "an IPv4 address. Defaults to None."
), ),
) )
parser.add_option( parser.add_option(
@ -380,12 +380,12 @@ def build_argument_parser():
"--port", "--port",
action="store", action="store",
type="int", type="int",
default=5696, default=None,
dest="port", dest="port",
help=( help=(
"The port number the server will be bound to. An integer " "The port number the server will be bound to. An integer "
"representing a port number. Recommended to be 5696 according to " "representing a port number. Recommended to be 5696 according to "
"the KMIP specification. Defaults to 5696." "the KMIP specification. Defaults to None."
), ),
) )
parser.add_option( parser.add_option(
@ -429,11 +429,12 @@ def build_argument_parser():
"--auth_suite", "--auth_suite",
action="store", action="store",
type="str", type="str",
default="Basic", default=None,
dest="auth_suite", dest="auth_suite",
help=( help=(
"A string representing the type of authentication suite to use " "A string representing the type of authentication suite to use "
"when establishing TLS connections. Defaults to 'Basic'." "when establishing TLS connections. Options include 'Basic' and "
"'TLS1.2'. Defaults to None."
), ),
) )
parser.add_option( parser.add_option(