Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-3]: src Pull up following revision(s) (requested by jwise in tick...
details: https://anonhg.NetBSD.org/src/rev/49cc68d6c30b
branches: netbsd-3
changeset: 577106:49cc68d6c30b
user: tron <tron%NetBSD.org@localhost>
date: Sun Sep 04 19:57:50 2005 +0000
description:
Pull up following revision(s) (requested by jwise in ticket #725):
etc/named.conf: revision 1.1
etc/namedb/named.conf: file removal
etc/namedb/Makefile: revision 1.2
etc/Makefile: revision 1.314
distrib/sets/lists/etc/mi: revision 1.159
Move "named.conf" example configuration to "/etc" because that is where
named(8) looks for it. You can now really get a caching name server
by simply setting "named=yes" in "/etc/rc.conf" as documented in
The NetBSD Guide. This fixes PR bin/30662 by Christian Hattemer.
diffstat:
distrib/sets/lists/etc/mi | 5 ++-
etc/Makefile | 4 +-
etc/named.conf | 65 +++++++++++++++++++++++++++++++++++++++++++++++
etc/namedb/Makefile | 4 +-
etc/namedb/named.conf | 65 -----------------------------------------------
5 files changed, 72 insertions(+), 71 deletions(-)
diffs (190 lines):
diff -r 0235887c2aa8 -r 49cc68d6c30b distrib/sets/lists/etc/mi
--- a/distrib/sets/lists/etc/mi Sun Sep 04 13:45:25 2005 +0000
+++ b/distrib/sets/lists/etc/mi Sun Sep 04 19:57:50 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.153.2.3 2005/09/02 12:32:09 tron Exp $
+# $NetBSD: mi,v 1.153.2.4 2005/09/04 19:57:50 tron Exp $
./.cshrc etc-util-etc
./.profile etc-util-etc
./dev/MAKEDEV etc-sys-etc
@@ -67,10 +67,11 @@
./etc/mtree/NetBSD.dist etc-sys-etc
./etc/mtree/set.etc etc-sys-etc
./etc/mtree/special etc-sys-etc
+./etc/named.conf etc-bind-etc
./etc/namedb/127 etc-bind-etc
./etc/namedb/localhost etc-bind-etc
./etc/namedb/loopback.v6 etc-bind-etc
-./etc/namedb/named.conf etc-bind-etc
+./etc/namedb/named.conf etc-obsolete obsolete
./etc/namedb/root.cache etc-bind-etc
./etc/netconfig etc-net-etc
./etc/networks etc-net-etc
diff -r 0235887c2aa8 -r 49cc68d6c30b etc/Makefile
--- a/etc/Makefile Sun Sep 04 13:45:25 2005 +0000
+++ b/etc/Makefile Sun Sep 04 19:57:50 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.306.2.6 2005/04/20 11:14:59 tron Exp $
+# $NetBSD: Makefile,v 1.306.2.7 2005/09/04 19:57:50 tron Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -91,7 +91,7 @@
BIN1+= bootptab changelist csh.cshrc csh.login csh.logout daily \
daily.conf dm.conf floppytab ftpchroot ftpusers \
gettytab group hosts hosts.lpd inetd.conf lkm.conf locate.conf \
- mailer.conf man.conf monthly monthly.conf mrouted.conf \
+ mailer.conf man.conf monthly monthly.conf mrouted.conf named.conf \
netconfig networks newsyslog.conf nsswitch.conf ntp.conf \
passwd.conf phones printcap profile protocols \
rbootd.conf rc rc.conf rc.lkm rc.local rc.subr rc.shutdown remote rpc \
diff -r 0235887c2aa8 -r 49cc68d6c30b etc/named.conf
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/etc/named.conf Sun Sep 04 19:57:50 2005 +0000
@@ -0,0 +1,65 @@
+# $NetBSD: named.conf,v 1.2.2.2 2005/09/04 19:57:50 tron Exp $
+
+# boot file for secondary name server
+# Note that there should be one primary entry for each SOA record.
+
+options {
+ directory "/etc/namedb";
+};
+
+zone "." {
+ type hint;
+ file "root.cache";
+};
+
+zone "localhost" {
+ type master;
+ file "localhost";
+};
+
+zone "127.IN-ADDR.ARPA" {
+ type master;
+ file "127";
+};
+
+zone "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.int" {
+ type master;
+ file "loopback.v6";
+};
+
+zone "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa" {
+ type master;
+ file "loopback.v6";
+};
+
+# example secondary server config:
+#
+# zone "Berkeley.EDU" {
+# type slave;
+# file "berkeley.edu.cache";
+# masters {
+# 128.32.130.11;
+# 128.32.133.1;
+# };
+# };
+
+# zone "32.128.IN-ADDR.ARPA" {
+# type slave;
+# file "128.32.cache";
+# masters {
+# 128.32.130.11;
+# 128.32.133.1;
+# };
+# };
+
+# example primary server config:
+#
+# zone "Berkeley.EDU" {
+# type master;
+# file "berkeley.edu";
+# };
+
+# zone "32.128.IN-ADDR.ARPA" {
+# type master;
+# file "128.32";
+# };
diff -r 0235887c2aa8 -r 49cc68d6c30b etc/namedb/Makefile
--- a/etc/namedb/Makefile Sun Sep 04 13:45:25 2005 +0000
+++ b/etc/namedb/Makefile Sun Sep 04 19:57:50 2005 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2004/05/16 09:53:09 lukem Exp $
+# $NetBSD: Makefile,v 1.1.2.1 2005/09/04 19:57:50 tron Exp $
-CONFIGFILES= 127 root.cache named.conf localhost loopback.v6
+CONFIGFILES= 127 root.cache localhost loopback.v6
FILESDIR= /etc/namedb
FILESMODE= 644
diff -r 0235887c2aa8 -r 49cc68d6c30b etc/namedb/named.conf
--- a/etc/namedb/named.conf Sun Sep 04 13:45:25 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-# $NetBSD: named.conf,v 1.8 2002/02/26 08:48:35 itojun Exp $
-
-# boot file for secondary name server
-# Note that there should be one primary entry for each SOA record.
-
-options {
- directory "/etc/namedb";
-};
-
-zone "." {
- type hint;
- file "root.cache";
-};
-
-zone "localhost" {
- type master;
- file "localhost";
-};
-
-zone "127.IN-ADDR.ARPA" {
- type master;
- file "127";
-};
-
-zone "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.int" {
- type master;
- file "loopback.v6";
-};
-
-zone "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa" {
- type master;
- file "loopback.v6";
-};
-
-# example secondary server config:
-#
-# zone "Berkeley.EDU" {
-# type slave;
-# file "berkeley.edu.cache";
-# masters {
-# 128.32.130.11;
-# 128.32.133.1;
-# };
-# };
-
-# zone "32.128.IN-ADDR.ARPA" {
-# type slave;
-# file "128.32.cache";
-# masters {
-# 128.32.130.11;
-# 128.32.133.1;
-# };
-# };
-
-# example primary server config:
-#
-# zone "Berkeley.EDU" {
-# type master;
-# file "berkeley.edu";
-# };
-
-# zone "32.128.IN-ADDR.ARPA" {
-# type master;
-# file "128.32";
-# };
Home |
Main Index |
Thread Index |
Old Index