Skip to content

allow for omitting dnssec-enable #255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ansgarwiechers wants to merge 1 commit into
base: master
Choose a base branch
from
Open

allow for omitting dnssec-enable #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion manifests/server/options.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,12 @@
# Controls whether to enable/disable DNS-SEC support. Boolean.
# Default is false on RedHat 5 (for the same reasons as
# dnssec_validation above), and true on Debian and on RedHat 6
# and above.
# and above. For Ubuntu 22.04 and above the default value is undef
# (see below).
#
# Setting the value to undef omits this option entirely from the
# config. This is because the option had been obsoleted in BIND
# 9.15.0 and was removed entirely in BIND 9.18.0.
#
# [*forward_policy*]
# The forwarding policy to use. Must be `first` or `only`.
Expand Down
13 changes: 12 additions & 1 deletion manifests/server/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,18 @@
$service = 'bind9'
$default_file = '/etc/default/bind9'
$default_template = 'default.debian.erb'
$default_dnssec_enable = true
case $::facts['os']['name'] {
'Ubuntu': {
if (versioncmp($::facts['os']['release']['major'], '22.04') >= 0) {
$default_dnssec_enable = undef
} else {
$default_dnssec_enable = true
}
}
default: {
$default_dnssec_enable = true
}
}
$default_dnssec_validation = 'auto'
if versioncmp( $::operatingsystemmajrelease, '8' ) >= 0 {
$necessary_packages = [ 'bind9', 'bind9utils' ]
Expand Down
4 changes: 3 additions & 1 deletion templates/named.conf.options.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,10 @@ options {
// If BIND logs error messages about the root key being expired,
// you will need to update your keys. See https://www.isc.org/bind-keys
//========================================================================
<% if @dnssec_enable -%>
<% if @dnssec.nil? or (@dnssec_enable == true) -%>
<% if @dnssec == true -%>
dnssec-enable yes;
<% end -%>
<%- if @dnssec_validation != 'absent' -%>
dnssec-validation <%= @dnssec_validation %>;
<%- end -%>
Expand Down