From 161f948cdd1eed52e3a05052fcd0e7b7210de35f Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Tue, 29 Sep 2020 17:31:34 +0200 Subject: [PATCH] Unbound: rebuild unbound blacklist download, fix previous (.conf files are being imported by unbound so we need to use another suffix for our config files) --- src/opnsense/scripts/unbound/download_blacklists.py | 4 ++-- src/opnsense/service/templates/OPNsense/Unbound/core/+TARGETS | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/opnsense/scripts/unbound/download_blacklists.py b/src/opnsense/scripts/unbound/download_blacklists.py index ddd2bbce0..950a05d8d 100755 --- a/src/opnsense/scripts/unbound/download_blacklists.py +++ b/src/opnsense/scripts/unbound/download_blacklists.py @@ -84,9 +84,9 @@ if __name__ == '__main__': startup_time = time.time() syslog.openlog('unbound', logoption=syslog.LOG_DAEMON, facility=syslog.LOG_LOCAL4) blacklist_items = set() - if os.path.exists('/var/unbound/etc/blacklists.conf'): + if os.path.exists('/var/unbound/etc/blacklists.ini'): cnf = ConfigParser() - cnf.read('/var/unbound/etc/blacklists.conf') + cnf.read('/var/unbound/etc/blacklists.ini') # exclude (white) lists, compile to regex to be used to filter blacklist entries if cnf.has_section('exclude'): exclude_list = set() diff --git a/src/opnsense/service/templates/OPNsense/Unbound/core/+TARGETS b/src/opnsense/service/templates/OPNsense/Unbound/core/+TARGETS index b8cbb2578..a0883b8c0 100644 --- a/src/opnsense/service/templates/OPNsense/Unbound/core/+TARGETS +++ b/src/opnsense/service/templates/OPNsense/Unbound/core/+TARGETS @@ -1,4 +1,4 @@ root.min.hints:/var/unbound/root.hints miscellaneous.conf:/var/unbound/etc/miscellaneous.conf dot.conf:/var/unbound/etc/dot.conf -blacklists.conf:/var/unbound/etc/blacklists.conf +blacklists.conf:/var/unbound/etc/blacklists.ini