upstream: Add new root-hints file and remove default-zones

It looks like Ubuntu 26.04 (bind9 1:9.20.11-2) added root-hints and removed
default-zones.

diff --git a/db.0 b/db.0
deleted file mode 100644 (file)
index e3aabdb..0000000
--- a/db.0
+++ /dev/null
@@ -1,12 +0,0 @@
-;
-; BIND reverse data file for broadcast zone
-;
-$TTL   604800
-@      IN      SOA     localhost. root.localhost. (
-                             1         ; Serial
-                        604800         ; Refresh
-                         86400         ; Retry
-                       2419200         ; Expire
-                        604800 )       ; Negative Cache TTL
-;
-@      IN      NS      localhost.

diff --git a/db.127 b/db.127
deleted file mode 100644 (file)
index cd05bef..0000000
--- a/db.127
+++ /dev/null
@@ -1,13 +0,0 @@
-;
-; BIND reverse data file for local loopback interface
-;
-$TTL   604800
-@      IN      SOA     localhost. root.localhost. (
-                             1         ; Serial
-                        604800         ; Refresh
-                         86400         ; Retry
-                       2419200         ; Expire
-                        604800 )       ; Negative Cache TTL
-;
-@      IN      NS      localhost.
-1.0.0  IN      PTR     localhost.

diff --git a/db.255 b/db.255
deleted file mode 100644 (file)
index e3aabdb..0000000
--- a/db.255
+++ /dev/null
@@ -1,12 +0,0 @@
-;
-; BIND reverse data file for broadcast zone
-;
-$TTL   604800
-@      IN      SOA     localhost. root.localhost. (
-                             1         ; Serial
-                        604800         ; Refresh
-                         86400         ; Retry
-                       2419200         ; Expire
-                        604800 )       ; Negative Cache TTL
-;
-@      IN      NS      localhost.

diff --git a/db.empty b/db.empty
deleted file mode 100644 (file)
index 8a12858..0000000
--- a/db.empty
+++ /dev/null
@@ -1,14 +0,0 @@
-; BIND reverse data file for empty rfc1918 zone
-;
-; DO NOT EDIT THIS FILE - it is used for multiple zones.
-; Instead, copy it, edit named.conf, and use that copy.
-;
-$TTL   86400
-@      IN      SOA     localhost. root.localhost. (
-                             1         ; Serial
-                        604800         ; Refresh
-                         86400         ; Retry
-                       2419200         ; Expire
-                         86400 )       ; Negative Cache TTL
-;
-@      IN      NS      localhost.

diff --git a/db.local b/db.local
deleted file mode 100644 (file)
index 2f272d4..0000000
--- a/db.local
+++ /dev/null
@@ -1,14 +0,0 @@
-;
-; BIND data file for local loopback interface
-;
-$TTL   604800
-@      IN      SOA     localhost. root.localhost. (
-                             2         ; Serial
-                        604800         ; Refresh
-                         86400         ; Retry
-                       2419200         ; Expire
-                        604800 )       ; Negative Cache TTL
-;
-@      IN      NS      localhost.
-@      IN      A       127.0.0.1
-@      IN      AAAA    ::1

diff --git a/db.root b/db.root
deleted file mode 100644 (file)
index f0b79d2..0000000
--- a/db.root
+++ /dev/null
@@ -1,90 +0,0 @@
-;       This file holds the information on root name servers needed to
-;       initialize cache of Internet domain name servers
-;       (e.g. reference this file in the "cache  .  <file>"
-;       configuration file of BIND domain name servers).
-;
-;       This file is made available by InterNIC 
-;       under anonymous FTP as
-;           file                /domain/named.cache
-;           on server           FTP.INTERNIC.NET
-;       -OR-                    RS.INTERNIC.NET
-;
-;       last update:    February 17, 2016
-;       related version of root zone:   2016021701
-;
-; formerly NS.INTERNIC.NET
-;
-.                        3600000      NS    A.ROOT-SERVERS.NET.
-A.ROOT-SERVERS.NET.      3600000      A     198.41.0.4
-A.ROOT-SERVERS.NET.      3600000      AAAA  2001:503:ba3e::2:30
-;
-; FORMERLY NS1.ISI.EDU
-;
-.                        3600000      NS    B.ROOT-SERVERS.NET.
-B.ROOT-SERVERS.NET.      3600000      A     192.228.79.201
-B.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:84::b
-;
-; FORMERLY C.PSI.NET
-;
-.                        3600000      NS    C.ROOT-SERVERS.NET.
-C.ROOT-SERVERS.NET.      3600000      A     192.33.4.12
-C.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:2::c
-;
-; FORMERLY TERP.UMD.EDU
-;
-.                        3600000      NS    D.ROOT-SERVERS.NET.
-D.ROOT-SERVERS.NET.      3600000      A     199.7.91.13
-D.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:2d::d
-;
-; FORMERLY NS.NASA.GOV
-;
-.                        3600000      NS    E.ROOT-SERVERS.NET.
-E.ROOT-SERVERS.NET.      3600000      A     192.203.230.10
-;
-; FORMERLY NS.ISC.ORG
-;
-.                        3600000      NS    F.ROOT-SERVERS.NET.
-F.ROOT-SERVERS.NET.      3600000      A     192.5.5.241
-F.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:2f::f
-;
-; FORMERLY NS.NIC.DDN.MIL
-;
-.                        3600000      NS    G.ROOT-SERVERS.NET.
-G.ROOT-SERVERS.NET.      3600000      A     192.112.36.4
-;
-; FORMERLY AOS.ARL.ARMY.MIL
-;
-.                        3600000      NS    H.ROOT-SERVERS.NET.
-H.ROOT-SERVERS.NET.      3600000      A     198.97.190.53
-H.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:1::53
-;
-; FORMERLY NIC.NORDU.NET
-;
-.                        3600000      NS    I.ROOT-SERVERS.NET.
-I.ROOT-SERVERS.NET.      3600000      A     192.36.148.17
-I.ROOT-SERVERS.NET.      3600000      AAAA  2001:7fe::53
-;
-; OPERATED BY VERISIGN, INC.
-;
-.                        3600000      NS    J.ROOT-SERVERS.NET.
-J.ROOT-SERVERS.NET.      3600000      A     192.58.128.30
-J.ROOT-SERVERS.NET.      3600000      AAAA  2001:503:c27::2:30
-;
-; OPERATED BY RIPE NCC
-;
-.                        3600000      NS    K.ROOT-SERVERS.NET.
-K.ROOT-SERVERS.NET.      3600000      A     193.0.14.129
-K.ROOT-SERVERS.NET.      3600000      AAAA  2001:7fd::1
-;
-; OPERATED BY ICANN
-;
-.                        3600000      NS    L.ROOT-SERVERS.NET.
-L.ROOT-SERVERS.NET.      3600000      A     199.7.83.42
-L.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:3::42
-;
-; OPERATED BY WIDE
-;
-.                        3600000      NS    M.ROOT-SERVERS.NET.
-M.ROOT-SERVERS.NET.      3600000      A     202.12.27.33
-M.ROOT-SERVERS.NET.      3600000      AAAA  2001:dc3::35
-; End of file

diff --git a/named.conf b/named.conf
index 880786afdc8586d1f07b85288e6fd721a6a636aa..68c40613e3d47fe95f6868d28625163c25cdc5b2 100644 (file)
--- a/named.conf
+++ b/named.conf
@@ -8,4 +8,4 @@
 
 include "/etc/bind/named.conf.options";
 include "/etc/bind/named.conf.local";
-include "/etc/bind/named.conf.default-zones";
+include "/etc/bind/named.conf.root-hints";

diff --git a/named.conf.default-zones b/named.conf.default-zones
deleted file mode 100644 (file)
index 355338b..0000000
--- a/named.conf.default-zones
+++ /dev/null
@@ -1,30 +0,0 @@
-// prime the server with knowledge of the root servers
-zone "." {
-       type hint;
-       file "/etc/bind/db.root";
-};
-
-// be authoritative for the localhost forward and reverse zones, and for
-// broadcast zones as per RFC 1912
-
-zone "localhost" {
-       type master;
-       file "/etc/bind/db.local";
-};
-
-zone "127.in-addr.arpa" {
-       type master;
-       file "/etc/bind/db.127";
-};
-
-zone "0.in-addr.arpa" {
-       type master;
-       file "/etc/bind/db.0";
-};
-
-zone "255.in-addr.arpa" {
-       type master;
-       file "/etc/bind/db.255";
-};
-
-

diff --git a/named.conf.root-hints b/named.conf.root-hints
new file mode 100644 (file)
index 0000000..39d4066
--- /dev/null
+++ b/named.conf.root-hints
@@ -0,0 +1,5 @@
+// prime the server with knowledge of the root servers
+zone "." {
+       type hint;
+       file "/usr/share/dns/root.hints";
+};