From fe1ceca8fd3623349366c786d2e83afad31913df Mon Sep 17 00:00:00 2001 From: Nate Riffe Date: Sat, 6 Oct 2012 10:50:02 -0500 Subject: [PATCH] Allow override of BIND's version string --- manifests/init.pp | 1 + templates/named.conf.erb | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index f7c1d6d..603f321 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -3,6 +3,7 @@ class bind ( $cachedir = $bind::params::cachedir, $forwarders = [], $dnssec = true, + $version = '', ) inherits bind::params { include concat::setup diff --git a/templates/named.conf.erb b/templates/named.conf.erb index f2ed75f..4dcf836 100644 --- a/templates/named.conf.erb +++ b/templates/named.conf.erb @@ -7,9 +7,9 @@ options { directory "<%= cachedir %>"; <%- if not forwarders.empty? -%> forwarders { -<%- forwarders.each do |forwarder| -%> +<%- forwarders.each do |forwarder| -%> <%= forwarder %>; -<%- end -%> +<%- end -%> }; <%- end -%> auth-nxdomain <%= auth_nxdomain ? 'yes' : 'no' %>; @@ -17,4 +17,7 @@ options { dnssec-enable <%= dnssec ? 'yes' : 'no' %>; dnssec-validation <%= dnssec ? 'yes' : 'no' %>; dnssec-lookaside <%= dnssec ? 'auto' : 'no' %>; +<%- if version != '' -%> + version "<%= version %>"; +<%- end -%> };