Add new named configuration template and remove old template

3 files changed, 100 insertions, 64 deletions

diff --git a/etc/Makefile b/etc/Makefile
index f0a3c05..cfb05ce 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
-#	$Id: Makefile,v 1.162 1997/10/20 00:35:17 jmb Exp $
+#	$Id: Makefile,v 1.163 1997/11/09 14:24:24 brian Exp $
 
 # -rw-r--r--
 BINOWN= root
@@ -24,7 +24,7 @@ BIN3=	netstart pccard_ether
 
 MTREE=	BSD.include.dist BSD.local.dist BSD.root.dist BSD.usr.dist \
 	BSD.var.dist BSD.x11.dist
-NAMEDB=	PROTO.localhost.rev named.boot named.root make-localhost
+NAMEDB= PROTO.localhost.rev named.conf named.root make-localhost
 PPPCNF= ppp.conf.sample ppp.linkup.sample ppp.linkdown.sample \
 	ppp.secret.sample ppp.deny ppp.shells.sample
 NOSPAM=	Makefile README sendmail.cf.additions
diff --git a/etc/namedb/named.boot b/etc/namedb/named.boot
deleted file mode 100644
index 0974909..0000000
--- a/etc/namedb/named.boot
+++ /dev/null
@@ -1,62 +0,0 @@
-;	$Id: named.boot,v 1.5 1997/02/23 09:21:09 peter Exp $
-;	From: @(#)named.boot	5.1 (Berkeley) 6/30/90
-
-; Refer to the named(8) man page for details.  If you are ever going
-; to setup a primary server, make sure you've understood the hairy
-; details of how DNS is working.  Even with simple mistakes, you can
-; break connectivity for affected parties, or cause huge amount of
-; useless Internet traffic.
-;
-; Setting up secondaries is way easier and the rough picture for this
-; is explained below.
-;
-; If you enable a local name server, don't forget to enter 127.0.0.1
-; into your /etc/resolv.conf so this server will be queried first.
-; Also, make sure to enable it in /etc/rc.conf.
-
-; example sortlist config:
-; sortlist 127.0.0.0
-
-directory	/etc/namedb
-
-; type    domain		source host/file		backup file
-
-cache     .							named.root
-primary   0.0.127.IN-ADDR.ARPA	localhost.rev
-
-; NB: Do not use the IP addresses below, they are faked, and only
-; serve demonstration/documentation purposes!
-;
-; Example secondary config entries.  It can be convenient to become
-; a secondary at least for the zone where your own domain is in.  Ask           
-; your network administrator for the IP address of the responsible              
-; primary.                                                                      
-;
-; Never forget to include the reverse lookup (IN-ADDR.ARPA) zone!
-; (This is the first bytes of the respective IP address, in reverse             
-; order, with ".IN-ADDR.ARPA" appended.)                                        
-;
-; Before starting to setup a primary zone, better make sure you fully
-; understand how DNS and BIND works, however.  There are sometimes   
-; unobvious pitfalls.  Setting up a secondary is comparably simpler.
-;
-; NB: Don't blindly enable the examples below. :-)  Use actual names
-; and addresses instead.                                              
-;
-;type       zone name               IP of primary  backup file name
-;==================================================================     
-;secondary  domain.com              192.168.1.1    domain.com.bak  
-;secondary  0.168.192.in-addr.arpa  192.168.1.1    0.168.192.in-addr.arpa.bak
-;
-; 
-; If you've got a DNS server around at your upstream provider, enter            
-; its IP address here, and enable the line below.  This will make you
-; benefit from its cache, thus reduce overall DNS traffic in the Internet.
-;
-;forwarders 127.0.0.1
-;
-; In addition to the "forwarders" clause, you can force your name
-; server to never initiate queries of its own, but always ask its
-; forwarders only, by enabling the following line:
-;
-;options forward-only
diff --git a/etc/namedb/named.conf b/etc/namedb/named.conf
new file mode 100644
index 0000000..8d927c5
--- /dev/null
+++ b/etc/namedb/named.conf
@@ -0,0 +1,98 @@
+// $Id: named.boot,v 1.6 1997/05/08 15:23:28 joerg Exp $
+// From: @(#)named.boot	5.1 (Berkeley) 6/30/90
+// Refer to the named(8) man page for details.  If you are ever going
+// to setup a primary server, make sure you've understood the hairy
+// details of how DNS is working.  Even with simple mistakes, you can
+// break connectivity for affected parties, or cause huge amount of
+// useless Internet traffic.
+
+options {
+	directory "/etc/namedb";
+
+// In addition to the "forwarders" clause, you can force your name
+// server to never initiate queries of its own, but always ask its
+// forwarders only, by enabling the following line:
+// 
+//      forward only;
+
+// If you've got a DNS server around at your upstream provider, enter            
+// its IP address here, and enable the line below.  This will make you
+// benefit from its cache, thus reduce overall DNS traffic in the Internet.
+/*
+	forwarders {
+		127.0.0.1;
+	};
+*/
+	/*
+	 * 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 uses an unprivileged
+	 * port by default.
+	 */
+	// query-source address * port 53;
+};
+
+// Note: the following will be supported in a future release.
+/*
+host { any; } {
+	topology {
+		127.0.0.0/8;
+	};
+};
+*/
+
+// Setting up secondaries is way easier and the rough picture for this
+// is explained below.
+// 
+// If you enable a local name server, don't forget to enter 127.0.0.1
+// into your /etc/resolv.conf so this server will be queried first.
+// Also, make sure to enable it in /etc/rc.conf.
+
+zone "." {
+	type hint;
+	file "named.root";
+};
+
+zone "0.0.127.IN-ADDR.ARPA" {
+	type master;
+	file "localhost.rev";
+};
+
+// NB: Do not use the IP addresses below, they are faked, and only
+// serve demonstration/documentation purposes!
+// 
+// Example secondary config entries.  It can be convenient to become
+// a secondary at least for the zone where your own domain is in.  Ask           
+// your network administrator for the IP address of the responsible              
+// primary.                                                                      
+// 
+// Never forget to include the reverse lookup (IN-ADDR.ARPA) zone!
+// (This is the first bytes of the respective IP address, in reverse             
+// order, with ".IN-ADDR.ARPA" appended.)                                        
+// 
+// Before starting to setup a primary zone, better make sure you fully
+// understand how DNS and BIND works, however.  There are sometimes   
+// unobvious pitfalls.  Setting up a secondary is comparably simpler.
+// 
+// NB: Don't blindly enable the examples below. :-)  Use actual names
+// and addresses instead.                                              
+
+/*
+zone "domain.com" {
+	type slave;
+	file "domain.com.bak";
+	masters {
+		192.168.1.1;
+	};
+};
+
+zone "0.168.192.in-addr.arpa" {
+	type slave;
+	file "0.168.192.in-addr.arpa.bak";
+	masters {
+		192.168.1.1;
+	};
+};
+*/
+