change default nsd(8) paths. ok sthen@

8 files changed, 61 insertions, 35 deletions

diff --git a/etc/mtree/4.4BSD.dist b/etc/mtree/4.4BSD.dist
index 5ce84e86fbe..8900ca17ae5 100644
--- a/etc/mtree/4.4BSD.dist
+++ b/etc/mtree/4.4BSD.dist
@@ -1,4 +1,4 @@
-#	$OpenBSD: 4.4BSD.dist,v 1.213 2010/12/28 14:31:12 jasper Exp $
+#	$OpenBSD: 4.4BSD.dist,v 1.214 2011/01/24 10:39:46 jakob Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 # .
@@ -2364,6 +2364,32 @@ tmp		uname=root gname=named mode=0775
 # ./var/named
 ..
 
+# ./var/nsd
+nsd
+
+# ./var/nsd/db
+db		uname=root gname=wheel mode=0755
+# ./var/nsd/db
+..
+
+# ./var/nsd/dev
+dev
+# ./var/nsd/dev
+..
+
+# ./var/nsd/run
+run		uname=root gname=_nsd mode=0775
+# ./var/nsd/run
+..
+
+# ./var/nsd/zones
+zones		uname=root gname=wheel mode=0755
+# ./var/nsd/zones
+..
+
+# ./var/nsd
+..
+
 # ./var/obj				XXX
 #obj
 # ./var/obj				XXX
diff --git a/usr.sbin/nsd/Makefile.bsd-wrapper b/usr.sbin/nsd/Makefile.bsd-wrapper
index af03f175a9e..bc1d8e6504e 100644
--- a/usr.sbin/nsd/Makefile.bsd-wrapper
+++ b/usr.sbin/nsd/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.5 2010/08/22 09:30:18 jakob Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.6 2011/01/24 10:39:46 jakob Exp $
 
 .include <bsd.own.mk>
 
@@ -15,11 +15,11 @@ CONFIGURE_OPTS=	--prefix=/usr \
 		--with-user=${USER} \
 		--with-nsd-conf-file=/etc/nsd.conf \
 		--with-chroot=${CHROOTDIR} \
-		--with-pidfile=${CHROOTDIR}/nsd.pid \
+		--with-pidfile=${CHROOTDIR}/run/nsd.pid \
 		--with-zonesdir=${CHROOTDIR}/zones \
-		--with-dbfile=${CHROOTDIR}/nsd.db \
-		--with-difffile=${CHROOTDIR}/ixfr.db \
-		--with-xfrdfile=${CHROOTDIR}/xfrd.state \
+		--with-dbfile=${CHROOTDIR}/db/nsd.db \
+		--with-difffile=${CHROOTDIR}/run/ixfr.db \
+		--with-xfrdfile=${CHROOTDIR}/run/xfrd.state \
 		--enable-root-server
 
 PROG=	nsd nsd-zonec nsd-notify nsd-checkconf nsd-patch nsd-xfer
diff --git a/usr.sbin/nsd/nsd-checkconf.8 b/usr.sbin/nsd/nsd-checkconf.8
index ea1e4a68688..61abea90570 100644
--- a/usr.sbin/nsd/nsd-checkconf.8
+++ b/usr.sbin/nsd/nsd-checkconf.8
@@ -79,7 +79,7 @@ The \-o, \-s and \-z option print configfile options to standard output.
 .RE
 .SH "FILES"
 .TP
-/etc/nsd/nsd.conf
+/etc/nsd.conf
 default
 .B NSD
 configuration file
diff --git a/usr.sbin/nsd/nsd-patch.8 b/usr.sbin/nsd/nsd-patch.8
index 872ea78c19f..45aee1acb64 100644
--- a/usr.sbin/nsd/nsd-patch.8
+++ b/usr.sbin/nsd/nsd-patch.8
@@ -28,7 +28,7 @@ difffile does not grow infinitely.
 .TP
 .B \-c\fI configfile
 Read specified configfile instead of the default
-.IR /etc/nsd/nsd.conf .
+.IR /etc/nsd.conf .
 .TP
 .B \-f
 Forces writing zone files. Also zones that have not changed are written
@@ -50,12 +50,12 @@ Skip writing zone files. No zones are written back to their zone files.
 Read specified difffile. Overrides the config file setting.
 .SH "FILES"
 .TP
-/var/db/nsd/nsd.db
+/var/nsd/db/nsd.db
 default
 .B NSD
 database
 .TP
-/etc/nsd/nsd.conf
+/etc/nsd.conf
 default
 .B NSD
 configuration file
diff --git a/usr.sbin/nsd/nsd-zonec.8 b/usr.sbin/nsd/nsd-zonec.8
index abd42d71482..c5ca4c70518 100644
--- a/usr.sbin/nsd/nsd-zonec.8
+++ b/usr.sbin/nsd/nsd-zonec.8
@@ -33,13 +33,13 @@ It is normally invoked via nsdc(8) rebuild command.
 .B Zonec
 will then parse every zone in nsd.conf(5) file and add it to the 
 name space database,
-.I /var/db/nsd/nsd.db
+.I /var/nsd/db/nsd.db
 by default, that is used by nsd(8) to answer incoming queries.
 .SH "OPTIONS"
 .TP
 .B \-c\fI configfile
 Read specified configfile instead of the default 
-.IR /etc/nsd/nsd.conf .
+.IR /etc/nsd.conf .
 .TP
 .B \-C 
 No config file is read (use with \-f, \-o and \-z).
@@ -91,7 +91,7 @@ Set debug facilities. (If compiled with \-\-enable\-checking.)
 Set debug level. (If compiled with \-\-enable\-checking.)
 .SH "FILES"
 .TP
-/var/db/nsd/nsd.db
+/var/nsd/db/nsd.db
 default
 .B NSD
 database
diff --git a/usr.sbin/nsd/nsd.8 b/usr.sbin/nsd/nsd.8
index 46a31ccf894..27f995865a7 100644
--- a/usr.sbin/nsd/nsd.8
+++ b/usr.sbin/nsd/nsd.8
@@ -118,7 +118,7 @@ Turn on debugging mode, do not fork, stay in the foreground.
 Use the specified
 .I database
 instead of the default of
-.IR /var/db/nsd/nsd.db .
+.IR /var/nsd/db/nsd.db .
 If a 
 .B zonesdir: 
 is specified in the config file this path can be relative to that 
@@ -167,7 +167,7 @@ default is 10.
 Use the specified
 .I pidfile
 instead of the platform specific default, which is mostly
-.IR /var/run/nsd.pid .
+.IR /var/nsd/run/nsd.pid .
 If a 
 .B zonesdir: 
 is specified in the config file, this path can be relative to that 
@@ -227,15 +227,15 @@ SIGUSR1
 Dump BIND8\-style statistics into the log. Ignored otherwise.
 .SH "FILES"
 .TP
-/var/db/nsd/nsd.db
+/var/nsd/db/nsd.db
 default
 .B NSD
 database
 .TP
-/var/run/nsd.pid
+/var/nsd/run/nsd.pid
 the process id of the name server.
 .TP
-/etc/nsd/nsd.conf
+/etc/nsd.conf
 default
 .B NSD
 configuration file
diff --git a/usr.sbin/nsd/nsd.conf.5 b/usr.sbin/nsd/nsd.conf.5
index 47f1fb95abd..f4a2154263d 100644
--- a/usr.sbin/nsd/nsd.conf.5
+++ b/usr.sbin/nsd/nsd.conf.5
@@ -31,7 +31,7 @@ An example of a short nsd.conf file is below.
 .TP
 server:
 .RS 5
-database: "/var/db/nsd/nsd.db"
+database: "/var/nsd/db/nsd.db"
 .RE
 .RS 5
 username: nsd
@@ -40,13 +40,13 @@ username: nsd
 logfile: "/var/log/nsd.log"
 .RE
 .RS 5
-pidfile: "/var/run/nsd.pid"
+pidfile: "/var/nsd/run/nsd.pid"
 .RE
 .RS 5
-difffile: "/var/db/nsd/ixfr.db"
+difffile: "/var/nsd/run/ixfr.db"
 .RE
 .RS 5
-xfrdfile: "/var/db/nsd/xfrd.state"
+xfrdfile: "/var/nsd/run/rfrd.state"
 .RE
 .TP
 zone:
@@ -57,7 +57,7 @@ name: example.com
 # note that quotes are optional on the value
 .RE
 .RS 5
-zonefile: /etc/nsd/example.com.zone 
+zonefile: /var/nsd/zones/example.com
 .RE
 .SH "FILE FORMAT"
 There must be whitespace between keywords. Attribute keywords end 
@@ -124,7 +124,7 @@ option
 .TP
 .B database:\fR <filename>
 By default 
-.I /var/db/nsd/nsd.db
+.I /var/nsd/db/nsd.db
 is used. The specified file is used to store the compiled 
 zone information. Same as commandline option 
 .BR \-f.
@@ -208,7 +208,7 @@ file, log file) relative to this directory. Set the value to ""
 When NSD receives IXFR updates it will store them in this file. 
 This file contains the differences between the database file and the 
 latest zone version. Default is 
-.IR /var/db/nsd/ixfr.db .
+.IR /var/nsd/run/ixfr.db .
 .TP
 .B xfrdfile:\fR <filename>
 The soa timeout and zone transfer daemon in NSD will save its state 
@@ -216,7 +216,7 @@ to this file. State is read back after a restart. The state file can
 be deleted without too much harm, but timestamps of zones will be 
 gone. For more details see the section on zone expiry behavior of 
 NSD. Default is
-.IR /var/db/nsd/xfrd.state .
+.IR /var/nsd/run/xfrd.state .
 .TP
 .B xrfd\-reload\-timeout:\fR <number>
 If this value is \-1, xfrd will not trigger a reload after a zone 
@@ -494,12 +494,12 @@ also function as a resolver or cache. The configuration options that
 BIND9 has for the resolver or caching thus have no equivalents for NSD.
 .SH "FILES"
 .TP
-/var/db/nsd/nsd.db
+/var/nsd/db/nsd.db
 default
 .B NSD
 database
 .TP
-/etc/nsd/nsd.conf
+/etc/nsd.conf
 default
 .B NSD
 configuration file
diff --git a/usr.sbin/nsd/nsdc.8 b/usr.sbin/nsd/nsdc.8
index 1f87099bdf6..ca59dc3a4d1 100644
--- a/usr.sbin/nsd/nsdc.8
+++ b/usr.sbin/nsd/nsdc.8
@@ -111,35 +111,35 @@ ensures that the difffile does not grow infinitely.
 .TP
 .B \-c\fI configfile
 Specify configfile to use instead of the default
-.IR /etc/nsd/nsd.conf .
+.IR /etc/nsd.conf .
 .SH "FILES"
 .TP
-/etc/nsd/nsd.conf
+/etc/nsd.conf
 Configuration file for nsd to change default pathnames and
 .B NSD 
 flags. The zone names, pathnames to zone files and access control 
 lists are also in nsd.conf(5).
 .TP
-/var/db/nsd/nsd.db
+/var/nsd/db/nsd.db
 default
 .B NSD
 database
 .TP
-/var/db/nsd/nsd.db.lock
+/var/nsd/db/nsd.db.lock
 Lockfile for the
 .B NSD
 database access by operator tools.
 .TP
-/var/db/nsd/ixfr.db
+/var/nsd/run/ixfr.db
 Journal of zone transfers, the diff file containing the new zone 
 contents transferred.
 .TP
-/var/db/nsd/xfrd.state
+/var/nsd/run/xfrd.state
 State for the zone transfer process of 
 .BR NSD. 
 Contains timeouts for the zones and whether zones are expired.
 .TP
-/var/run/nsd.pid
+/var/nsd/run/nsd.pid
 the process id of the name server.
 .SH "DIAGNOSTICS"
 .LP