From 5b414102ba8358f902233581c0a0ac04e954e3cf Mon Sep 17 00:00:00 2001 From: Noah Levitt Date: Wed, 24 Jan 2018 10:27:40 -0800 Subject: [PATCH] respect CA-related command line options --- setup.py | 2 +- warcprox/warcproxy.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index ea17303..f345120 100755 --- a/setup.py +++ b/setup.py @@ -52,7 +52,7 @@ except: setuptools.setup( name='warcprox', - version='2.4b1.dev142', + version='2.4b1.dev143', description='WARC writing MITM HTTP/S proxy', url='https://github.com/internetarchive/warcprox', author='Noah Levitt', diff --git a/warcprox/warcproxy.py b/warcprox/warcproxy.py index 8850821..7ae5ab4 100644 --- a/warcprox/warcproxy.py +++ b/warcprox/warcproxy.py @@ -404,7 +404,8 @@ class SingleThreadedWarcProxy(http_server.HTTPServer, object): ca_name = ('Warcprox CA on %s' % socket.gethostname())[:64] self.ca = CertificateAuthority( - ca_file='warcprox-ca.pem', certs_dir='./warcprox-ca', + ca_file=options.cacert or 'warcprox-ca.pem', + certs_dir=options.certs_dir or './warcprox-ca', ca_name=ca_name) self.recorded_url_q = warcprox.TimestampedQueue(