Gentoo Archives: gentoo-commits

From: "Robin H. Johnson (robbat2)" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-dns/bind/files: named.init-r7 named.confd-r3
Date: Thu, 25 Feb 2010 19:03:36
Message-Id: E1Nkizj-00079r-Vk@stork.gentoo.org
1 robbat2 10/02/25 19:03:31
2
3 Modified: named.init-r7 named.confd-r3
4 Log:
5 Bug #306789: Depending on configuration, we might need to tell RNDC where to connect.
6 (Portage version: 2.2_rc63/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.2 net-dns/bind/files/named.init-r7
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/bind/files/named.init-r7?rev=1.2&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/bind/files/named.init-r7?rev=1.2&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/bind/files/named.init-r7?r1=1.1&r2=1.2
14
15 Index: named.init-r7
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r7,v
18 retrieving revision 1.1
19 retrieving revision 1.2
20 diff -p -w -b -B -u -u -r1.1 -r1.2
21 --- named.init-r7 12 Nov 2009 08:37:16 -0000 1.1
22 +++ named.init-r7 25 Feb 2010 19:03:31 -0000 1.2
23 @@ -1,7 +1,7 @@
24 #!/sbin/runscript
25 # Copyright 1999-2009 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r7,v 1.1 2009/11/12 08:37:16 scarabeus Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r7,v 1.2 2010/02/25 19:03:31 robbat2 Exp $
29
30 opts="start stop reload restart"
31
32 @@ -95,7 +95,7 @@ stop() {
33 ebegin "Stopping ${CHROOT:+chrooted }named"
34 checkconfig || return 2
35 if [ -f $KEY ] ; then
36 - rndc -k $KEY stop &>/dev/null
37 + rndc $SERVER -k $KEY stop &>/dev/null
38 else
39 start-stop-daemon --stop --quiet --pidfile $PIDFILE \
40 --exec /usr/sbin/named -- stop
41 @@ -133,7 +133,7 @@ reload() {
42
43 if [ -f $KEY ] ; then
44 ebegin "Reloading named.conf and zone files"
45 - rndc -k $KEY reload &>/dev/null
46 + rndc $SERVER -k $KEY reload &>/dev/null
47 eend $?
48 else /etc/init.d/named restart &>/dev/null
49 fi
50
51
52
53 1.2 net-dns/bind/files/named.confd-r3
54
55 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/bind/files/named.confd-r3?rev=1.2&view=markup
56 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/bind/files/named.confd-r3?rev=1.2&content-type=text/plain
57 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/bind/files/named.confd-r3?r1=1.1&r2=1.2
58
59 Index: named.confd-r3
60 ===================================================================
61 RCS file: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.confd-r3,v
62 retrieving revision 1.1
63 retrieving revision 1.2
64 diff -p -w -b -B -u -u -r1.1 -r1.2
65 --- named.confd-r3 12 Nov 2009 08:37:16 -0000 1.1
66 +++ named.confd-r3 25 Feb 2010 19:03:31 -0000 1.2
67 @@ -6,6 +6,9 @@ OPTIONS=""
68 # Leave this unchanged if you want bind to automatically detect the number
69 #CPU="1"
70
71 +# RNDC needs to be told what server we're using sometimes.
72 +#SERVER="-s 127.0.0.1"
73 +
74 # If you wish to run bind in a chroot, run:
75 # emerge --config =<bind-version>
76 # and un-comment the following line.