backup/warcprox
1
0
Fork 0
mirror of https://github.com/internetarchive/warcprox.git synced 2025-01-18 13:22:09 +01:00
Code Issues Projects Releases Activity

respect CA-related command line options

Browse Source
This commit is contained in:
Noah Levitt 2018-01-24 10:27:40 -08:00
parent 1cfb4d46c6
commit 5b414102ba
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup.py
View File

@ -52,7 +52,7 @@ except:
setuptools.setup( setuptools.setup(
name='warcprox', name='warcprox',
version='2.4b1.dev142', version='2.4b1.dev143',
description='WARC writing MITM HTTP/S proxy', description='WARC writing MITM HTTP/S proxy',
url='https://github.com/internetarchive/warcprox', url='https://github.com/internetarchive/warcprox',
author='Noah Levitt', author='Noah Levitt',

3
warcprox/warcproxy.py
View File

@ -404,7 +404,8 @@ class SingleThreadedWarcProxy(http_server.HTTPServer, object):
ca_name = ('Warcprox CA on %s' % socket.gethostname())[:64] ca_name = ('Warcprox CA on %s' % socket.gethostname())[:64]
self.ca = CertificateAuthority( 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) ca_name=ca_name)
self.recorded_url_q = warcprox.TimestampedQueue( self.recorded_url_q = warcprox.TimestampedQueue(