From 007e3b16c82b967a7550b99d4be30deae730c9b2 Mon Sep 17 00:00:00 2001 From: Juliano Martinez Date: Fri, 25 Jan 2019 12:05:46 -0800 Subject: [PATCH 01/12] adds transfers-in, transfers-out and transfers-per-ns --- manifests/init.pp | 3 +++ templates/named.conf.erb | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/manifests/init.pp b/manifests/init.pp index ec31384..1e71d6d 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -15,6 +15,9 @@ $chroot = false, $chroot_class = $::bind::defaults::chroot_class, $chroot_dir = $::bind::defaults::chroot_dir, + $transfers_in = undef, + $transfers_per_ns = undef, + $transfers_out = undef, # NOTE: we need to be able to override this parameter when declaring class, # especially when not using hiera (i.e. when using Foreman as ENC): $default_zones_include = $::bind::defaults::default_zones_include, diff --git a/templates/named.conf.erb b/templates/named.conf.erb index a69f4ef..7dd9bde 100644 --- a/templates/named.conf.erb +++ b/templates/named.conf.erb @@ -25,6 +25,15 @@ options { <%- end -%> <%- if @forward != '' -%> forward <%= @forward %>; +<%- end -%> +<%- if @transfers_in -%> + transfers-in <%= @transfers_in %>; +<%- end -%> +<%- if @transfers_out -%> + transfers-out <%= @transfers_out %>; +<%- end -%> +<%- if @transfers_per_ns -%> + transfers-per-ns <%= @transfers_per_ns %>; <%- end -%> auth-nxdomain <%= @auth_nxdomain ? 'yes' : 'no' %>; listen-on-v6 { any; }; From 5d2e3c1a655fd8023a31f7b20870e854d8a86540 Mon Sep 17 00:00:00 2001 From: Juliano Martinez Date: Fri, 1 Mar 2019 14:33:35 +0100 Subject: [PATCH 02/12] adds support for file params --- manifests/logging/channel.pp | 1 + templates/logging_channel.erb | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/manifests/logging/channel.pp b/manifests/logging/channel.pp index db0a5cd..d6f0c1c 100644 --- a/manifests/logging/channel.pp +++ b/manifests/logging/channel.pp @@ -9,6 +9,7 @@ $print_category = true, $print_severity = true, $print_time = true, + $file_params = undef, ) { unless member(['file', 'syslog', 'stderr', 'null'], $destination) { fail("Bind::logging::channel[${name}] has invalid destination: ${destination}. Must be one of: file syslog stderr null") diff --git a/templates/logging_channel.erb b/templates/logging_channel.erb index e20e5a7..edbc155 100644 --- a/templates/logging_channel.erb +++ b/templates/logging_channel.erb @@ -1,7 +1,11 @@ channel <%= @name %> { <%- case @destination -%> <%- when "file" -%> + <%- if @file_params -%> + file "<%= @file_path %>/<%= @file_name %> <%= @file_params %>"; + <%- else -%> file "<%= @file_path %>/<%= @file_name %>"; + <%- end -%> <%- when "syslog" -%> syslog <%= @syslog_facility %>; <%- when "stderr" -%> From 2ba0558e7f75bb0c62937a74824edc01e1fb6942 Mon Sep 17 00:00:00 2001 From: Juliano Martinez Date: Fri, 1 Mar 2019 14:47:48 +0100 Subject: [PATCH 03/12] params go outside --- templates/logging_channel.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/logging_channel.erb b/templates/logging_channel.erb index edbc155..212f224 100644 --- a/templates/logging_channel.erb +++ b/templates/logging_channel.erb @@ -2,7 +2,7 @@ <%- case @destination -%> <%- when "file" -%> <%- if @file_params -%> - file "<%= @file_path %>/<%= @file_name %> <%= @file_params %>"; + file "<%= @file_path %>/<%= @file_name %>" <%= @file_params %>; <%- else -%> file "<%= @file_path %>/<%= @file_name %>"; <%- end -%> From 00754d38c8e831e5d0be1443c915f700e80640c0 Mon Sep 17 00:00:00 2001 From: Juliano Martinez Date: Fri, 15 Mar 2019 14:09:10 +0100 Subject: [PATCH 04/12] adds *-refresh-time and *-retry-time --- manifests/init.pp | 4 ++++ templates/named.conf.erb | 24 ++++++++++++++++++------ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 1e71d6d..849a103 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -18,6 +18,10 @@ $transfers_in = undef, $transfers_per_ns = undef, $transfers_out = undef, + $max_refresh_time = undef, + $min_refresh_time = undef, + $max_retry_time = undef, + $min_retry_time = undef, # NOTE: we need to be able to override this parameter when declaring class, # especially when not using hiera (i.e. when using Foreman as ENC): $default_zones_include = $::bind::defaults::default_zones_include, diff --git a/templates/named.conf.erb b/templates/named.conf.erb index 7dd9bde..71bdcbc 100644 --- a/templates/named.conf.erb +++ b/templates/named.conf.erb @@ -27,13 +27,25 @@ options { forward <%= @forward %>; <%- end -%> <%- if @transfers_in -%> - transfers-in <%= @transfers_in %>; + transfers-in <%= @transfers_in %>; <%- end -%> <%- if @transfers_out -%> - transfers-out <%= @transfers_out %>; + transfers-out <%= @transfers_out %>; <%- end -%> <%- if @transfers_per_ns -%> - transfers-per-ns <%= @transfers_per_ns %>; + transfers-per-ns <%= @transfers_per_ns %>; +<%- end -%> +<%- if @max_refresh_time -%> + max-refresh-time <%= @min_refresh_time %>; +<%- end -%> +<%- if @min_refresh_time -%> + min-refresh-time <%= @min_refresh_time %>; +<%- end -%> +<%- if @max_retry_time -%> + max-retry-time <%= @min_retry_time %>; +<%- end -%> +<%- if @min_retry_time -%> + min-retry-time <%= @min_retry_time %>; <%- end -%> auth-nxdomain <%= @auth_nxdomain ? 'yes' : 'no' %>; listen-on-v6 { any; }; @@ -45,17 +57,17 @@ options { dnssec-validation yes; dnssec-lookaside auto; <%- if @isc_bind_keys -%> - bindkeys-file "<%= @isc_bind_keys %>"; + bindkeys-file "<%= @isc_bind_keys %>"; <%- end -%> <%- end -%> <%- if @version != '' -%> version "<%= @version %>"; <%- end -%> <%- if @tkey_gssapi_credential -%> - tkey-gssapi-credential "<%= @tkey_gssapi_credential %>"; + tkey-gssapi-credential "<%= @tkey_gssapi_credential %>"; <%- end -%> <%- if @tkey_domain -%> - tkey-domain "<%= @tkey_domain %>"; + tkey-domain "<%= @tkey_domain %>"; <%- end -%> }; <%- if @include_local -%> From 94984bd8ac39510c1dbadab089429b49572bbb69 Mon Sep 17 00:00:00 2001 From: Juliano Martinez Date: Fri, 15 Mar 2019 14:27:17 +0100 Subject: [PATCH 05/12] fix max names and add query_log --- 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 849a103..a9c0f8a 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -22,6 +22,7 @@ $min_refresh_time = undef, $max_retry_time = undef, $min_retry_time = undef, + $query_log = undef, # NOTE: we need to be able to override this parameter when declaring class, # especially when not using hiera (i.e. when using Foreman as ENC): $default_zones_include = $::bind::defaults::default_zones_include, diff --git a/templates/named.conf.erb b/templates/named.conf.erb index 71bdcbc..1c5856b 100644 --- a/templates/named.conf.erb +++ b/templates/named.conf.erb @@ -26,6 +26,9 @@ options { <%- if @forward != '' -%> forward <%= @forward %>; <%- end -%> +<%- if @query_log -%> + query_log <%= @query_log %>; +<%- end -%> <%- if @transfers_in -%> transfers-in <%= @transfers_in %>; <%- end -%> @@ -36,13 +39,13 @@ options { transfers-per-ns <%= @transfers_per_ns %>; <%- end -%> <%- if @max_refresh_time -%> - max-refresh-time <%= @min_refresh_time %>; + max-refresh-time <%= @max_refresh_time %>; <%- end -%> <%- if @min_refresh_time -%> min-refresh-time <%= @min_refresh_time %>; <%- end -%> <%- if @max_retry_time -%> - max-retry-time <%= @min_retry_time %>; + max-retry-time <%= @max_retry_time %>; <%- end -%> <%- if @min_retry_time -%> min-retry-time <%= @min_retry_time %>; From 6ad2edb5bf72fef78ee6578539d54cfc5433de14 Mon Sep 17 00:00:00 2001 From: Juliano Martinez Date: Fri, 15 Mar 2019 14:34:31 +0100 Subject: [PATCH 06/12] query_log on template --- 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 1c5856b..501ce63 100644 --- a/templates/named.conf.erb +++ b/templates/named.conf.erb @@ -27,7 +27,7 @@ options { forward <%= @forward %>; <%- end -%> <%- if @query_log -%> - query_log <%= @query_log %>; + querylog <%= @query_log %>; <%- end -%> <%- if @transfers_in -%> transfers-in <%= @transfers_in %>; From 391085c9d3bea3e552a616fa380f3126fd0398fc Mon Sep 17 00:00:00 2001 From: Juliano Martinez Date: Fri, 15 Mar 2019 15:59:50 +0100 Subject: [PATCH 07/12] adds support for request-ixfr --- 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 a9c0f8a..90443f8 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -23,6 +23,7 @@ $max_retry_time = undef, $min_retry_time = undef, $query_log = undef, + $request_ixfr = undef, # NOTE: we need to be able to override this parameter when declaring class, # especially when not using hiera (i.e. when using Foreman as ENC): $default_zones_include = $::bind::defaults::default_zones_include, diff --git a/templates/named.conf.erb b/templates/named.conf.erb index 501ce63..d83aad5 100644 --- a/templates/named.conf.erb +++ b/templates/named.conf.erb @@ -29,6 +29,9 @@ options { <%- if @query_log -%> querylog <%= @query_log %>; <%- end -%> +<%- if @request_ixfr -%> + request-ixfr <%= @request_ixfr %>; +<%- end -%> <%- if @transfers_in -%> transfers-in <%= @transfers_in %>; <%- end -%> From bcb202620333c816de7ffe6fc9506cc788c49cdd Mon Sep 17 00:00:00 2001 From: Juliano Martinez Date: Fri, 15 Mar 2019 16:13:37 +0100 Subject: [PATCH 08/12] adds support for serial-query-rate --- 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 90443f8..57230b8 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -24,6 +24,7 @@ $min_retry_time = undef, $query_log = undef, $request_ixfr = undef, + $serial_query_rate = undef, # NOTE: we need to be able to override this parameter when declaring class, # especially when not using hiera (i.e. when using Foreman as ENC): $default_zones_include = $::bind::defaults::default_zones_include, diff --git a/templates/named.conf.erb b/templates/named.conf.erb index d83aad5..d0fcb66 100644 --- a/templates/named.conf.erb +++ b/templates/named.conf.erb @@ -32,6 +32,9 @@ options { <%- if @request_ixfr -%> request-ixfr <%= @request_ixfr %>; <%- end -%> +<%- if @serial_query_rate -%> + serial-query-rate <%= @serial_query_rate %>; +<%- end -%> <%- if @transfers_in -%> transfers-in <%= @transfers_in %>; <%- end -%> From 91af30c89bcc1c1426039ed2993be661d42030bd Mon Sep 17 00:00:00 2001 From: Juliano Martinez Date: Wed, 27 Mar 2019 12:55:32 +0100 Subject: [PATCH 09/12] add support for nsid --- 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 57230b8..4298ed2 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -25,6 +25,7 @@ $query_log = undef, $request_ixfr = undef, $serial_query_rate = undef, + $server_id = false, # NOTE: we need to be able to override this parameter when declaring class, # especially when not using hiera (i.e. when using Foreman as ENC): $default_zones_include = $::bind::defaults::default_zones_include, diff --git a/templates/named.conf.erb b/templates/named.conf.erb index d0fcb66..8846887 100644 --- a/templates/named.conf.erb +++ b/templates/named.conf.erb @@ -72,6 +72,9 @@ options { <%- if @version != '' -%> version "<%= @version %>"; <%- end -%> +<%- if @server_id -%> + server-id hostname; +<%- end -%> <%- if @tkey_gssapi_credential -%> tkey-gssapi-credential "<%= @tkey_gssapi_credential %>"; <%- end -%> From ef3b6c96f436610272d7980b2b5e8dc5ad4b3dae Mon Sep 17 00:00:00 2001 From: Juliano Martinez Date: Tue, 2 Apr 2019 15:44:35 +0200 Subject: [PATCH 10/12] adds max ncache ttl --- 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 4298ed2..88fbf05 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -26,6 +26,7 @@ $request_ixfr = undef, $serial_query_rate = undef, $server_id = false, + $max_ncache_ttl = undef, # NOTE: we need to be able to override this parameter when declaring class, # especially when not using hiera (i.e. when using Foreman as ENC): $default_zones_include = $::bind::defaults::default_zones_include, diff --git a/templates/named.conf.erb b/templates/named.conf.erb index 8846887..a747122 100644 --- a/templates/named.conf.erb +++ b/templates/named.conf.erb @@ -55,6 +55,9 @@ options { <%- end -%> <%- if @min_retry_time -%> min-retry-time <%= @min_retry_time %>; +<%- end -%> +<%- if @max_ncache_ttl -%> + max-ncache-ttl <%= @max_ncache_ttl %>; <%- end -%> auth-nxdomain <%= @auth_nxdomain ? 'yes' : 'no' %>; listen-on-v6 { any; }; From a5e00f5f8729d60b3da9e28143001295118a817e Mon Sep 17 00:00:00 2001 From: Juliano Martinez Date: Wed, 17 Apr 2019 10:40:29 +0200 Subject: [PATCH 11/12] adds ixfr-from-differences --- 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 88fbf05..baa5c21 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -27,6 +27,7 @@ $serial_query_rate = undef, $server_id = false, $max_ncache_ttl = undef, + $ixfr_from_differences = undef, # NOTE: we need to be able to override this parameter when declaring class, # especially when not using hiera (i.e. when using Foreman as ENC): $default_zones_include = $::bind::defaults::default_zones_include, diff --git a/templates/named.conf.erb b/templates/named.conf.erb index a747122..3e1654c 100644 --- a/templates/named.conf.erb +++ b/templates/named.conf.erb @@ -32,6 +32,9 @@ options { <%- if @request_ixfr -%> request-ixfr <%= @request_ixfr %>; <%- end -%> +<%- if @ixfr_from_differences -%> + ixfr-from-differences <%= @ixfr_from_differences %>; +<%- end -%> <%- if @serial_query_rate -%> serial-query-rate <%= @serial_query_rate %>; <%- end -%> From 1970b4e5e1112286d2557e517eb206c3a58148fa Mon Sep 17 00:00:00 2001 From: Juliano Martinez Date: Wed, 14 Aug 2019 15:18:35 +0200 Subject: [PATCH 12/12] send cookie --- 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 baa5c21..4b946f0 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -28,6 +28,7 @@ $server_id = false, $max_ncache_ttl = undef, $ixfr_from_differences = undef, + $send_cookie = true, # NOTE: we need to be able to override this parameter when declaring class, # especially when not using hiera (i.e. when using Foreman as ENC): $default_zones_include = $::bind::defaults::default_zones_include, diff --git a/templates/named.conf.erb b/templates/named.conf.erb index 3e1654c..ba53bdd 100644 --- a/templates/named.conf.erb +++ b/templates/named.conf.erb @@ -53,6 +53,9 @@ options { <%- if @min_refresh_time -%> min-refresh-time <%= @min_refresh_time %>; <%- end -%> +<%- if @send_cookie == false -%> + send-cookie false; +<%- end -%> <%- if @max_retry_time -%> max-retry-time <%= @max_retry_time %>; <%- end -%>