Skip to content

Commit b05630f

Browse files
smortexekohl
authored andcommitted
Add support for Debian 13
Debian 13 removed a bunch of default zones in favor of BIND 9 native directive `empty-zones yes` (that is on by default).
1 parent e7034da commit b05630f

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

manifests/params.pp

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,14 @@
77
$vardir = '/var/cache/bind'
88
$optionspath = "${dnsdir}/named.conf.options"
99
$zonefilepath = "${vardir}/zones"
10-
$localzonepath = "${dnsdir}/zones.rfc1918"
11-
$defaultzonepath = "${dnsdir}/named.conf.default-zones"
10+
$localzonepath = $facts['os']['name'] ? {
11+
'Debian' => if versioncmp($facts['os']['release']['major'], '13') >= 0 { 'unmanaged' } else { "${dnsdir}/zones.rfc1918" },
12+
default => "${dnsdir}/zones.rfc1918",
13+
}
14+
$defaultzonepath = $facts['os']['name'] ? {
15+
'Debian' => if versioncmp($facts['os']['release']['major'], '13') >= 0 { 'unmanaged' } else { "${dnsdir}/named.conf.default-zones" },
16+
default => "${dnsdir}/named.conf.default-zones",
17+
}
1218
$publicviewpath = "${dnsdir}/zones.conf"
1319
$viewconfigpath = "${dnsdir}/views"
1420
$dns_server_package = 'bind9'

metadata.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@
6060
"operatingsystem": "Debian",
6161
"operatingsystemrelease": [
6262
"11",
63-
"12"
63+
"12",
64+
"13"
6465
]
6566
},
6667
{

spec/classes/dns_init_spec.rb

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@
7070
let(:localzonepath) do
7171
case facts[:os]['family']
7272
when 'Debian'
73-
"#{etc_directory}/zones.rfc1918"
73+
if facts[:os]['release']['major'] != '13'
74+
"#{etc_directory}/zones.rfc1918"
75+
end
7476
when 'RedHat'
7577
"#{etc_directory}/named.rfc1912.zones"
7678
end
@@ -79,7 +81,9 @@
7981
let(:defaultzonepath) do
8082
case facts[:os]['family']
8183
when 'Debian'
82-
"#{etc_directory}/named.conf.default-zones"
84+
if facts[:os]['release']['major'] != '13'
85+
"#{etc_directory}/named.conf.default-zones"
86+
end
8387
end
8488
end
8589

0 commit comments

Comments
 (0)