From d0db9e6944e2f6ec9bd2cb5e1e14d7fef7fff9d0 Mon Sep 17 00:00:00 2001 From: Markus Pesch Date: Mon, 9 Jan 2023 17:54:49 +0100 Subject: [PATCH] fix: support port configuration of dns forwarder --- defaults/main.yml | 24 +++++++++++++++-------- templates/etc/named/named.conf.options.j2 | 6 +++++- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 2ad83dd..a7b7f91 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -35,14 +35,22 @@ bind9_options: blackhole: [] dnssec_validations: true forwarders: - - "8.8.8.8" # Google IPv4 - - "8.8.4.4" # Google IPv4 - - "2001:4860:4860::8888" # Google IPv6 - - "2001:4860:4860::8844" # Google IPv6 - - "208.67.222.222" # OpenDNS IPv4 - - "208.67.220.220" # OpenDNS IPv4 - - "2620:0:ccc::2" # OpenDNS IPv6 - - "2620:0:ccd::2" # OpenDNS IPv6 + - ip: "8.8.8.8" # Google IPv4 + port: "53" + - ip: "8.8.4.4" # Google IPv4 + port: "53" + - ip: "2001:4860:4860::8888" # Google IPv6 + port: "53" + - ip: "2001:4860:4860::8844" # Google IPv6 + port: "53" + - ip: "208.67.222.222" # OpenDNS IPv4 + port: "53" + - ip: "208.67.220.220" # OpenDNS IPv4 + port: "53" + - ip: "2620:0:ccc::2" # OpenDNS IPv6 + port: "53" + - ip: "2620:0:ccd::2" # OpenDNS IPv6 + port: "53" interface_interval: 0 listen_on_ipv4: - "127.0.0.1" diff --git a/templates/etc/named/named.conf.options.j2 b/templates/etc/named/named.conf.options.j2 index 249382d..11abf58 100644 --- a/templates/etc/named/named.conf.options.j2 +++ b/templates/etc/named/named.conf.options.j2 @@ -176,7 +176,11 @@ options { {% if bind9_options.forwarders is defined and bind9_options.forwarders | length > 0 %} forwarders { {% for forwarder in bind9_options.forwarders %} - {{ forwarder }}; +{% if forwarder.port is defined and forwarder.port | length > 0 %} + {{ forwarder.ip }} port {{ forwarder.port }}; +{% else %} + {{ forwarder.ip }}; +{% endif %} {% endfor %} }; {% else %}