From: Stephen Gran Date: Sun, 14 Apr 2013 16:09:16 +0000 (+0100) Subject: use correct test X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;ds=sidebyside;h=d8e3f059ef06d43cfbbd624774d756b86176fff4;hp=04ff326f9e84287fa1c944f562a3594a8a5fbbdb;p=mirror%2Fdsa-puppet.git use correct test Signed-off-by: Stephen Gran --- diff --git a/modules/unbound/manifests/init.pp b/modules/unbound/manifests/init.pp index 5261009bb..587b19bb6 100644 --- a/modules/unbound/manifests/init.pp +++ b/modules/unbound/manifests/init.pp @@ -10,6 +10,7 @@ class unbound { $is_recursor = getfromhash($site::nodeinfo, 'misc', 'resolver-recursive') $client_ranges = getfromhash($site::nodeinfo, 'hoster', 'allow_dns_query') + $dodgy_ns = getfromhash($site::nodeinfo, 'hoster', 'nameservers_break_dnssec') $ns = hiera('nameservers') package { 'unbound': diff --git a/modules/unbound/templates/unbound.conf.erb b/modules/unbound/templates/unbound.conf.erb index 5dad16318..0546980c9 100644 --- a/modules/unbound/templates/unbound.conf.erb +++ b/modules/unbound/templates/unbound.conf.erb @@ -44,7 +44,7 @@ server: auto-trust-anchor-file: "/var/lib/unbound/root.key" auto-trust-anchor-file: "/var/lib/unbound/debian.org.key" -<% if not @is_recursor and not @client_ranges -%> +<% if not @is_recursor and not @dodgy_ns -%> forward-zone: name: "." <% @ns.to_a.flatten.each do |nms| -%>