From 0177eb899a87995d0faaed8a836904cac7f844ce Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Sun, 2 Mar 2014 15:56:36 +1300 Subject: Support cert/key combo files in args. Improve argument names in SSLOptions --- pathod | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'pathod') diff --git a/pathod b/pathod index 5b82f97e..d150eac0 100755 --- a/pathod +++ b/pathod @@ -35,6 +35,7 @@ def main(parser, args): cn = args.cn, confdir = args.confdir, certfile = args.ssl_certfile, + keyfile = args.ssl_keyfile or args.ssl_certfile, not_after_connect = args.ssl_not_after_connect, ciphers = args.ciphers, sslversion = utils.SSLVERSIONS[args.sslversion] @@ -174,7 +175,11 @@ if __name__ == "__main__": ) group.add_argument( "--certfile", dest='ssl_certfile', default=None, type=str, - help='SSL cert file. If not specified, a default cert is used.' + help='SSL certificate in PEM format, optionally with the key in the same file.' + ) + group.add_argument( + "--keyfile", dest='ssl_keyfile', default=None, type=str, + help='Key matching certfile.' ) group.add_argument( "--ciphers", dest="ciphers", type=str, default=False, -- cgit v1.2.3