summaryrefslogtreecommitdiff
path: root/data/templates/dns-forwarding
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-09-25 19:21:36 +0200
committerChristian Poessinger <christian@poessinger.com>2020-09-25 19:21:36 +0200
commitf39f5dde342aa5e14d1fb4155920c61ac5fd11b1 (patch)
treeb6282ff86de6e8e40281d73e6d4f5b8d1140083c /data/templates/dns-forwarding
parent7f09beeac924b1bc9bf61f8153870bd4cb939b96 (diff)
downloadvyos-1x-f39f5dde342aa5e14d1fb4155920c61ac5fd11b1.tar.gz
vyos-1x-f39f5dde342aa5e14d1fb4155920c61ac5fd11b1.zip
dns: forwarding: T2921: migrate to get_config_dict()
Diffstat (limited to 'data/templates/dns-forwarding')
-rw-r--r--data/templates/dns-forwarding/recursor.conf.tmpl2
-rw-r--r--data/templates/dns-forwarding/recursor.forward-zones.conf.tmpl4
-rw-r--r--data/templates/dns-forwarding/recursor.vyos-hostsd.conf.lua.tmpl4
3 files changed, 5 insertions, 5 deletions
diff --git a/data/templates/dns-forwarding/recursor.conf.tmpl b/data/templates/dns-forwarding/recursor.conf.tmpl
index d233b8abc..b0ae3cc61 100644
--- a/data/templates/dns-forwarding/recursor.conf.tmpl
+++ b/data/templates/dns-forwarding/recursor.conf.tmpl
@@ -21,7 +21,7 @@ max-cache-entries={{ cache_size }}
max-negative-ttl={{ negative_ttl }}
# ignore-hosts-file
-export-etc-hosts={{ export_hosts_file }}
+export-etc-hosts={{ 'no' if ignore_hosts_file is defined else 'yes' }}
# listen-address
local-address={{ listen_address | join(',') }}
diff --git a/data/templates/dns-forwarding/recursor.forward-zones.conf.tmpl b/data/templates/dns-forwarding/recursor.forward-zones.conf.tmpl
index e62b9bb81..90f35ae1c 100644
--- a/data/templates/dns-forwarding/recursor.forward-zones.conf.tmpl
+++ b/data/templates/dns-forwarding/recursor.forward-zones.conf.tmpl
@@ -19,10 +19,10 @@
+.={{ n.dot_zone_ns }}
{% endif %}
-{% if forward_zones %}
+{% if forward_zones is defined %}
# zones added via 'service dns forwarding domain'
{% for zone, zonedata in forward_zones.items() %}
-{% if zonedata['recursion-desired'] %}+{% endif %}{{ zone }}={{ zonedata['nslist']|join(', ') }}
+{{ "+" if zonedata['recursion_desired'] is defined }}{{ zone }}={{ zonedata['server']|join(', ') }}
{% endfor %}
{% endif %}
diff --git a/data/templates/dns-forwarding/recursor.vyos-hostsd.conf.lua.tmpl b/data/templates/dns-forwarding/recursor.vyos-hostsd.conf.lua.tmpl
index 8fefae0b2..784d5c360 100644
--- a/data/templates/dns-forwarding/recursor.vyos-hostsd.conf.lua.tmpl
+++ b/data/templates/dns-forwarding/recursor.vyos-hostsd.conf.lua.tmpl
@@ -13,10 +13,10 @@ addNTA("{{ a }}.", "{{ tag }} alias")
{% endfor %}
{% endif %}
-{% if forward_zones %}
+{% if forward_zones is defined %}
-- from 'service dns forwarding domain'
{% for zone, zonedata in forward_zones.items() %}
-{% if zonedata['addNTA'] %}
+{% if zonedata['addnta'] is defined %}
addNTA("{{ zone }}", "static")
{% endif %}
{% endfor %}