Handle named.conf.options upgrade.

diff --git a/files/etc/bind/named.conf.options.expect b/files/etc/bind/named.conf.options.expect
new file mode 100644 (file)
index 0000000..3504a67
--- /dev/null
+++ b/files/etc/bind/named.conf.options.expect
@@ -0,0 +1,28 @@
+options {
+       directory "/var/cache/bind";
+
+       // If there is a firewall between you and nameservers you want
+       // to talk to, you might need to uncomment the query-source
+       // directive below.  Previous versions of BIND always asked
+       // questions using port 53, but BIND 8.1 and later use an unprivileged
+       // port by default.
+
+
+       // If your ISP provided one or more IP addresses for stable 
+       // nameservers, you probably want to use them as forwarders.  
+       // Uncomment the following block, and insert the addresses replacing 
+       // the all-0's placeholder.
+
+       // forwarders {
+       //      0.0.0.0;
+       // };
+
+       auth-nxdomain no;    # conform to RFC1035
+       listen-on-v6 { any; };
+};
+
+# Begin update by CARNet package bind9-cn -- DO NOT DELETE THIS LINE!
+logging {
+    category lame-servers { null; };
+};
+# End update by CARNet package bind9-cn -- DO NOT DELETE THIS LINE!

diff --git a/files/etc/bind/named.conf.options b/files/etc/bind/named.conf.options.restore
similarity index 96%
rename from files/etc/bind/named.conf.options
rename to files/etc/bind/named.conf.options.restore
index 813193d..74325eb 100644 (file)
--- a/files/etc/bind/named.conf.options
+++ b/files/etc/bind/named.conf.options.restore
@@ -19,6 +19,6 @@ options {
        // };
 
        auth-nxdomain no;    # conform to RFC1035
-
+       listen-on-v6 { any; };
 };