From owner-freebsd-questions@FreeBSD.ORG Wed Jul 23 14:34:06 2008 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3DD5F1065672 for ; Wed, 23 Jul 2008 14:34:06 +0000 (UTC) (envelope-from mcoyles@horbury.wakefield.sch.uk) Received: from smtp1-wak.yhgfl.net (smtp3-wak-ext.yhgfl.net [89.207.208.42]) by mx1.freebsd.org (Postfix) with ESMTP id CA4118FC13 for ; Wed, 23 Jul 2008 14:34:05 +0000 (UTC) (envelope-from mcoyles@horbury.wakefield.sch.uk) Received: from horbury.wakefield.sch.uk ([10.126.96.34]) by smtp1-wak.yhgfl.net (8.13.8/8.13.8/Debian-3) with ESMTP id m6NEHYCq029535 for ; Wed, 23 Jul 2008 15:17:35 +0100 Received: from ITTEAM02 [10.126.96.253] by horbury.wakefield.sch.uk with ESMTP (SMTPD32-7.07) id AD794E90154; Wed, 23 Jul 2008 15:17:29 +0100 From: "Marc Coyles" To: Date: Wed, 23 Jul 2008 15:17:26 +0100 Message-ID: <005a01c8ecce$d54e5d80$fd607e0a@Horbury.Internal> X-Priority: 3 (Normal) X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook, Build 10.0.4510 Importance: Normal X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.3198 X-YHGfL-MailScanner-Information: Please contact the YHGfL Foundation for more information X-YHGfL-MailScanner: Found to be clean X-YHGfL-MailScanner-MCPCheck: MCP-Clean, MCP-Checker (score=0, required 0.5) X-YHGfL-MailScanner-SpamCheck: not spam, SpamAssassin (not cached, score=-4.398, required 5, autolearn=not spam, ALL_TRUSTED -1.80, BAYES_00 -2.60, NORMAL_HTTP_TO_IP 0.00) X-MailScanner-From: mcoyles@horbury.wakefield.sch.uk Subject: Upgrade 6.2-Release to 7.0-Release - stuck! X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: mcoyles@horbury.wakefield.sch.uk List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Jul 2008 14:34:06 -0000 Am running freebsd-update following instructions at http://www.daemonology.net/blog/2007-11-11-freebsd-major-version-upgrade.htm l It’s decided that it can’t merge named.conf changes automagically and has dropped me into vi with the file open… looking as below. What exactly is it wanting me to do? T’isn’t particularly clear, and this is the first time I’ve ever attempted an upgrade… <<<<<<< current version include "/etc/namedb/rndc.key"; controls { inet 127.0.0.1 allow { localhost; } keys { "rndc-key"; }; }; // $FreeBSD: src/etc/namedb/named.conf,v 1.21.2.1 2005/09/10 08:27:27 dougb Exp $ ======= // $FreeBSD: src/etc/namedb/named.conf,v 1.26.4.1 2008/01/13 20:48:23 dougb Exp $ >>>>>>> 7.0-RELEASE // // Refer to the named.conf(5) and named(8) man pages, and the documentation // in /usr/share/doc/bind9 for more details. // // If you are going to set up an authoritative server, make sure you // understand the hairy details of how DNS works. Even with // simple mistakes, you can break connectivity for affected parties, // or cause huge amounts of useless Internet traffic. options { <<<<<<< current version pid-file "/var/run/named/pid"; ======= // Relative to the chroot directory, if any >>>>>>> 7.0-RELEASE directory "/etc/namedb"; dump-file "/var/dump/named_dump.db"; statistics-file "/var/stats/named.stats"; // If named is being used only as a local resolver, this is a safe default. // For named to be accessible to the network, comment this option, specify // the proper IP address, or delete this option. listen-on { 127.0.0.1; }; // If you have IPv6 enabled on this system, uncomment this option for // use as a local resolver. To give access to the network, specify // an IPv6 address, or the keyword "any". // listen-on-v6 { ::1; }; // These zones are already covered by the empty zones listed below. // If you remove the related empty zones below, comment these lines out. disable-empty-zone "255.255.255.255.IN-ADDR.ARPA"; disable-empty-zone "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.0.IP6.ARPA"; disable-empty-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"; // 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 versions 8 and later * use a pseudo-random unprivileged UDP port by default. */ // query-source address * port 53; }; // If you enable a local name server, don't forget to enter 127.0.0.1 // first in your /etc/resolv.conf so this server will be queried. // Also, make sure to enable it in /etc/rc.conf. // The traditional root hints mechanism. Use this, OR the slave zones below. zone "." { type hint; file "named.root"; }; /* Slaving the following zones from the root name servers has some significant advantages: 1. Faster local resolution for your users 2. No spurious traffic will be sent from your network to the roots 3. Greater resilience to any potential root server failure/DDoS On the other hand, this method requires more monitoring than the hints file to be sure that an unexpected failure mode has not incapacitated your server. Name servers that are serving a lot of clients will benefit more from this approach than individual hosts. Use with caution. To use this mechanism, uncomment the entries below, and comment the hint zone above. */ /* zone "." { <<<<<<< current version type hint; file "/etc/namedb/named.root"; ======= type slave; file "slave/root.slave"; masters { 192.5.5.241; // F.ROOT-SERVERS.NET. }; notify no; >>>>>>> 7.0-RELEASE }; <<<<<<< current version zone "0.0.127.IN-ADDR.ARPA" { type master; file "/etc/namedb/localhost.rev"; ======= zone "arpa" { type slave; file "slave/arpa.slave"; masters { 192.5.5.241; // F.ROOT-SERVERS.NET. }; notify no; >>>>>>> 7.0-RELEASE }; <<<<<<< current version // RFC 3152 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 "/etc/namedb/localhost-v6.rev"; ======= zone "in-addr.arpa" { type slave; file "slave/in-addr.arpa.slave"; masters { 192.5.5.241; // F.ROOT-SERVERS.NET. }; notify no; >>>>>>> 7.0-RELEASE }; */ /* Serving the following zones locally will prevent any queries for these zones leaving your network and going to the root name servers. This has two significant advantages: 1. Faster local resolution for your users 2. No spurious traffic will be sent from your network to the roots (no other <<>>>7.0-RELEASE beyond this point… Marc A Coyles ICT Support Team (ext 730) Mbl: 07850 518106