diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2003-02-04 01:35:10 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2003-02-04 01:35:10 +0000 |
| commit | aad7713bf64acff8508aebd07cbb07e4383ccbbf (patch) | |
| tree | ab869b7e6345d555acedab21f57ac672d3635534 /etc | |
| parent | da217bbcade665f70aa6fb149e7f7434657e978d (diff) | |
enable bind now; some diffs from jakob, some from me
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/Makefile | 23 | ||||
| -rw-r--r-- | etc/mtree/4.4BSD.dist | 25 | ||||
| -rw-r--r-- | etc/mtree/4.4BSD.usr | 8 |
3 files changed, 32 insertions, 24 deletions
diff --git a/etc/Makefile b/etc/Makefile index 66120ab5325..2b14cbdeddd 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.174 2002/12/31 16:22:25 miod Exp $ +# $OpenBSD: Makefile,v 1.175 2003/02/04 01:35:08 deraadt Exp $ TZDIR= /usr/share/zoneinfo LOCALTIME= US/Pacific @@ -31,7 +31,6 @@ BIN1+= wsconsctl.conf # -rw-rw-r-- BIN2= motd -NAMEDB= localhost.rev localhost.v6.rev localhost.zone root.cache PCS= pcs750.bin WCS1= wcs fppwcs poc poc1 poc2 fppoc WCS2= fpevent fppwcs fppwcs_dual hdcwcs load_diags start_fpp wcs wcs_dual @@ -167,11 +166,21 @@ distribution-etc-root-var: distrib-dirs ${DESTDIR}/etc/systrace; \ ${INSTALL} -c -o root -g wheel -m 600 usr_sbin_named \ ${DESTDIR}/etc/systrace; - cd namedb; \ - ${INSTALL} -c -o root -g ${BINGRP} -m 644 named.boot \ - ${DESTDIR}/var/named; \ - ${INSTALL} -c -o named -g ${BINGRP} -m 644 ${NAMEDB} \ - ${DESTDIR}/var/named/namedb + cd bind; \ + ${INSTALL} -c -o root -g named -m 640 named-simple.conf \ + ${DESTDIR}/var/named/etc/named.conf; \ + ${INSTALL} -c -o root -g named -m 640 named-*.conf \ + ${DESTDIR}/var/named/etc; \ + ${INSTALL} -c -o root -g wheel -m 644 db.localhost \ + ${DESTDIR}/var/named/standard/localhost; \ + ${INSTALL} -c -o root -g wheel -m 644 db.loopback \ + ${DESTDIR}/var/named/standard/loopback; \ + ${INSTALL} -c -o root -g wheel -m 644 db.loopback6.arpa \ + ${DESTDIR}/var/named/standard/loopback6.arpa; \ + ${INSTALL} -c -o root -g wheel -m 644 db.loopback6.int \ + ${DESTDIR}/var/named/standard/loopback6.int; \ + ${INSTALL} -c -o root -g wheel -m 644 root.hint \ + ${DESTDIR}/var/named/standard; \ /bin/rm -f ${DESTDIR}/etc/localtime ln -s ${TZDIR}/${LOCALTIME} ${DESTDIR}/etc/localtime /bin/rm -f ${DESTDIR}/etc/rmt diff --git a/etc/mtree/4.4BSD.dist b/etc/mtree/4.4BSD.dist index cf286e631a3..f6b0f9d28c6 100644 --- a/etc/mtree/4.4BSD.dist +++ b/etc/mtree/4.4BSD.dist @@ -1,4 +1,4 @@ -# $OpenBSD: 4.4BSD.dist,v 1.142 2003/01/29 07:32:20 jakob Exp $ +# $OpenBSD: 4.4BSD.dist,v 1.143 2003/02/04 01:35:08 deraadt Exp $ /set type=dir uname=root gname=wheel mode=0755 # . @@ -701,11 +701,6 @@ smm # ./usr/share/doc/smm/09.sendmail .. -# ./usr/share/doc/smm/10.named -10.named -# ./usr/share/doc/smm/10.named -.. - # ./usr/share/doc/smm/11.timedop 11.timedop # ./usr/share/doc/smm/11.timedop @@ -1912,13 +1907,23 @@ dev .. # ./var/named/etc -etc +etc uname=root gname=named mode=0750 # ./var/named/etc .. -# ./var/named/namedb -namedb uname=named gname=bin mode=0755 -# ./var/named/namedb +# ./var/named/master +master +# ./var/named/master +.. + +# ./var/named/slave +slave uname=root gname=named mode=0775 +# ./var/named/slave +.. + +# ./var/named/standard +standard +# ./var/named/standard .. # ./var/named diff --git a/etc/mtree/4.4BSD.usr b/etc/mtree/4.4BSD.usr index 84a6d3bd373..78fe7305a0b 100644 --- a/etc/mtree/4.4BSD.usr +++ b/etc/mtree/4.4BSD.usr @@ -1,4 +1,4 @@ -# $OpenBSD: 4.4BSD.usr,v 1.16 2002/05/23 18:43:00 deraadt Exp $ +# $OpenBSD: 4.4BSD.usr,v 1.17 2003/02/04 01:35:09 deraadt Exp $ # $NetBSD: 4.4BSD.usr,v 1.3 1996/05/12 23:30:37 thorpej Exp $ # # user: bostic @@ -963,12 +963,6 @@ vax type=dir uname=root gname=wheel mode=0775 .. -# ./share/doc/smm/10.named -10.named type=dir uname=root gname=wheel mode=0775 -# ./share/doc/smm/10.named -.. - - # ./share/doc/smm/11.timedop /set type=file gname=bin uname=root mode=0444 11.timedop type=dir uname=root gname=wheel mode=0775 |