From 89751eea38650eb63bb752eda7cf511c81c1619a Mon Sep 17 00:00:00 2001 From: Hossy Date: Tue, 18 Oct 2016 21:02:17 -0500 Subject: [PATCH 1/2] Support for "forward" statement Add "forward" statement in options { } block in named.conf. --- manifests/init.pp | 1 + templates/named.conf.erb | 3 +++ 2 files changed, 4 insertions(+) diff --git a/manifests/init.pp b/manifests/init.pp index bb2a91c..e13b1d0 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -2,6 +2,7 @@ class bind ( $forwarders = '', + $forward = undef, $dnssec = true, $filter_ipv6 = false, $version = '', diff --git a/templates/named.conf.erb b/templates/named.conf.erb index dfa595b..67a043b 100644 --- a/templates/named.conf.erb +++ b/templates/named.conf.erb @@ -20,6 +20,9 @@ options { <%= forwarder %>; <%- end -%> }; +<%- end -%> +<%- if @forward != '' -%> + forward <%= @forward %>; <%- end -%> auth-nxdomain <%= @auth_nxdomain ? 'yes' : 'no' %>; listen-on-v6 { any; }; From a19df9cd9e95550e9a09788f88003fea193de674 Mon Sep 17 00:00:00 2001 From: Hossy923 Date: Sat, 5 Nov 2016 10:09:53 -0500 Subject: [PATCH 2/2] Fixed handling of undef @forward Changed @forward check syntax to use "<%- if @variable and @variable != '' -%>" to address undef. --- templates/named.conf.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/named.conf.erb b/templates/named.conf.erb index 67a043b..970d1ca 100644 --- a/templates/named.conf.erb +++ b/templates/named.conf.erb @@ -21,7 +21,7 @@ options { <%- end -%> }; <%- end -%> -<%- if @forward != '' -%> +<%- if @forward and @forward != '' -%> forward <%= @forward %>; <%- end -%> auth-nxdomain <%= @auth_nxdomain ? 'yes' : 'no' %>;