From 871a05a76a9b0def478ed86660891556c5661a0c Mon Sep 17 00:00:00 2001 From: micronn Date: Fri, 1 May 2020 07:38:13 +0200 Subject: [PATCH] proxy mode: respect settings when started from cli (#557) --- pywb/warcserver/warcserver.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pywb/warcserver/warcserver.py b/pywb/warcserver/warcserver.py index d9dde162..d417c0fa 100644 --- a/pywb/warcserver/warcserver.py +++ b/pywb/warcserver/warcserver.py @@ -54,6 +54,8 @@ class WarcServer(BaseWarcServer): if custom_config: if 'collections' in custom_config and 'collections' in config: custom_config['collections'].update(config['collections']) + if 'proxy' in custom_config and 'proxy' in config: + custom_config['proxy'].update(config['proxy']) config.update(custom_config) super(WarcServer, self).__init__(debug=config.get('debug', False))