From 1eed416a3a01435110ca5c5486791f89db074e52 Mon Sep 17 00:00:00 2001 From: Ansgar Wiechers Date: Thu, 19 May 2022 12:47:51 +0200 Subject: [PATCH 1/2] use hints file defined in params.pp for root zone --- manifests/server/config.pp | 1 + templates/named.conf.default-zones.erb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/manifests/server/config.pp b/manifests/server/config.pp index 2bc4cbf6..db5cf893 100644 --- a/manifests/server/config.pp +++ b/manifests/server/config.pp @@ -4,6 +4,7 @@ $cfg_dir = $dns::server::params::cfg_dir, $cfg_file = $dns::server::params::cfg_file, $data_dir = $dns::server::params::data_dir, + $root_hint = $dns::server::params::root_hint, $owner = $dns::server::params::owner, $group = $dns::server::params::group, $enable_default_zones = true, diff --git a/templates/named.conf.default-zones.erb b/templates/named.conf.default-zones.erb index aa8cc2f6..c7d4c8fb 100644 --- a/templates/named.conf.default-zones.erb +++ b/templates/named.conf.default-zones.erb @@ -2,7 +2,7 @@ // prime the server with knowledge of the root servers zone "." { type hint; - file "<%= @cfg_dir %>/db.root"; + file "<%= @root_hint %>"; }; // be authoritative for the localhost forward and reverse zones, and for From ea14bf42bcd501fdbb2c4541bbb8b998ec0837c8 Mon Sep 17 00:00:00 2001 From: Ansgar Wiechers Date: Thu, 19 May 2022 12:51:42 +0200 Subject: [PATCH 2/2] added parameter for overriding root hints file to server class --- manifests/server.pp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/manifests/server.pp b/manifests/server.pp index fecdcfb0..2f3bf1f1 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -6,11 +6,12 @@ $necessary_packages = $dns::server::params::necessary_packages, $ensure_packages = $dns::server::params::ensure_packages, - $cfg_dir = $dns::server::params::cfg_dir, - $cfg_file = $dns::server::params::cfg_file, - $data_dir = $dns::server::params::data_dir, - $owner = $dns::server::params::owner, - $group = $dns::server::params::group, + $cfg_dir = $dns::server::params::cfg_dir, + $cfg_file = $dns::server::params::cfg_file, + $data_dir = $dns::server::params::data_dir, + $root_hint = $dns::server::params::root_hint, + $owner = $dns::server::params::owner, + $group = $dns::server::params::group, $enable_default_zones = true, ) inherits dns::server::params { @@ -21,6 +22,7 @@ cfg_dir => $cfg_dir, cfg_file => $cfg_file, data_dir => $data_dir, + root_hint => $root_hint, owner => $owner, group => $group, enable_default_zones => $enable_default_zones,