From ccddb825bc1fc2388f1440281044d2402154a417 Mon Sep 17 00:00:00 2001 From: Karlson2k Date: Fri, 18 Aug 2023 16:50:20 +0300 Subject: [PATCH] Unbound: fixed configuration when custom blocks are used (#6756) Signed-off-by: Evgeny Grin --- .../service/templates/OPNsense/Unbound/core/access_lists.conf | 1 + .../service/templates/OPNsense/Unbound/core/advanced.conf | 1 + .../service/templates/OPNsense/Unbound/core/private_domains.conf | 1 + 3 files changed, 3 insertions(+) diff --git a/src/opnsense/service/templates/OPNsense/Unbound/core/access_lists.conf b/src/opnsense/service/templates/OPNsense/Unbound/core/access_lists.conf index 6a6894915..b86138f23 100644 --- a/src/opnsense/service/templates/OPNsense/Unbound/core/access_lists.conf +++ b/src/opnsense/service/templates/OPNsense/Unbound/core/access_lists.conf @@ -1,3 +1,4 @@ +server: {% set default_action = OPNsense.unboundplus.acls.default_action|default('allow') %} access-control: 0.0.0.0/0 {{default_action}} access-control: ::/0 {{default_action}} diff --git a/src/opnsense/service/templates/OPNsense/Unbound/core/advanced.conf b/src/opnsense/service/templates/OPNsense/Unbound/core/advanced.conf index 7de8cfafe..360351c88 100644 --- a/src/opnsense/service/templates/OPNsense/Unbound/core/advanced.conf +++ b/src/opnsense/service/templates/OPNsense/Unbound/core/advanced.conf @@ -1,3 +1,4 @@ +server: {% macro set_boolean(name) -%} {% if name == '1' %}yes{%else%}no{%endif%} {%- endmacro %} diff --git a/src/opnsense/service/templates/OPNsense/Unbound/core/private_domains.conf b/src/opnsense/service/templates/OPNsense/Unbound/core/private_domains.conf index 59b0170a2..e42ddb0fe 100644 --- a/src/opnsense/service/templates/OPNsense/Unbound/core/private_domains.conf +++ b/src/opnsense/service/templates/OPNsense/Unbound/core/private_domains.conf @@ -1,4 +1,5 @@ {% if not helpers.empty('OPNsense.unboundplus.domains.domain') or not helpers.empty('OPNsense.unboundplus.dots.dot') %} +server: # Set private domains in case authoritative name server returns a Private IP address {% set domains = [] %} {% for domain in helpers.toList('OPNsense.unboundplus.domains.domain') %}