rpms/nsd/F-11 .cvsignore, 1.16, 1.17 nsd.cron, 1.6, 1.7 nsd.init, 1.14, 1.15 nsd.spec, 1.56, 1.57 nsd.sysconfig, 1.3, 1.4 sources, 1.23, 1.24
Paul Wouters
pwouters at fedoraproject.org
Wed Jan 6 21:24:48 UTC 2010
Author: pwouters
Update of /cvs/extras/rpms/nsd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22067
Modified Files:
.cvsignore nsd.cron nsd.init nsd.spec nsd.sysconfig sources
Log Message:
* Wed Jan 06 2010 Paul Wouters <paul at xelerance.com> - 3.2.4-1
- Upgraded to 3.2.4. Minor fixes to cron/init/sysconfig scripts
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nsd/F-11/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore 17 Aug 2009 14:53:55 -0000 1.16
+++ .cvsignore 6 Jan 2010 21:24:48 -0000 1.17
@@ -12,3 +12,4 @@ nsd-3.1.1.tar.gz
nsd-3.2.0.tar.gz
nsd-3.2.1.tar.gz
nsd-3.2.3.tar.gz
+nsd-3.2.4.tar.gz
Index: nsd.cron
===================================================================
RCS file: /cvs/extras/rpms/nsd/F-11/nsd.cron,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- nsd.cron 4 Jun 2009 18:19:33 -0000 1.6
+++ nsd.cron 6 Jan 2010 21:24:48 -0000 1.7
@@ -2,11 +2,19 @@
# Paul Wouters <paul at xelerance.com>
# This folds back zone updates, dynamic updates, etc that nsd records
-# in the ixfr.db and nsd.db files back into the zone files or visa
-# versa
+# in the ixfr.db and nsd.db files back into the zone files or vice-versa
+
+# Default settings - do not edit these but /etc/sysconfig/nsd instead!
+NSD_CONF="/etc/nsd/nsd.conf"
+NSDC_PROG="/usr/sbin/nsdc"
+NSD_CHECKCONF_PROG="/usr/sbin/nsd-checkconf"
+NSD_AUTORELOAD="yes"
+
+# Read in local settings.
+[ -r /etc/sysconfig/nsd ] && . /etc/sysconfig/nsd
# Ideally check if ixfr.db newer then any zones, only then do
-/usr/sbin/nsdc patch > /dev/null 2>&1
+$NSDC_PROG -c $NSD_CONF patch > /dev/null 2>&1
# We try to only rebuild/reload when neccessary. If 1 zone is newer,
# we need to rebuild the db file.
@@ -14,19 +22,25 @@
# complete this operation within an hour, but it should work fine for
# most other uses.
-for zonefile in `/usr/sbin/nsd-checkconf -v /etc/nsd/nsd.conf |grep zonefile: | sed "s/^.*\"\(.*\)\"/\1/"`
-do
- if [ $zonefile -nt /var/lib/nsd/nsd.db ]
- then
- echo "Zone $zonefile update requires nsd.db rebuild"
- /usr/sbin/nsdc rebuild > /dev/null 2>%1
- /usr/sbin/nsdc reload > /dev/null 2>%1
- break
- fi
-done
-
+case "$NSD_AUTORELOAD" in
+ [Yy]|[Yy][Ee][Ss])
+ database="`$NSD_CHECKCONF_PROG -o database $NSD_CONF`"
+ $NSD_CHECKCONF_PROG -v $NSD_CONF | grep zonefile: | sed "s/^.*\"\(.*\)\"/\1/" | while read zonefile
+ do
+ if [ $zonefile -nt $database ]
+ then
+ echo "Zone $zonefile update requires database rebuild"
+ $NSDC_PROG -c $NSD_CONF rebuild > /dev/null 2>&1
+ $NSDC_PROG -c $NSD_CONF reload > /dev/null 2>&1
+ break
+ fi
+ done
+ ;;
+ *)
+ ;;
+esac
# nsd checks the serial in notify requests, so its better to send an
# occasional redundant notify, then to miss it.
# According to the nsd team, this is no longer neccessary
-# /usr/sbin/nsdc notify > /dev/null 2>%1
+# $NSDC_PROG -c $NSD_CONF notify > /dev/null 2>&1
Index: nsd.init
===================================================================
RCS file: /cvs/extras/rpms/nsd/F-11/nsd.init,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- nsd.init 20 Aug 2009 15:28:12 -0000 1.14
+++ nsd.init 6 Jan 2010 21:24:48 -0000 1.15
@@ -44,6 +44,9 @@ start() {
[ -f $NSD_CONF ] || exit 5
[ -x $NSD_PROG ] || exit 5
+ [ -G /var/run/nsdhm ] || chown nsd.nsd /var/run/nsdhm
+ [ -G /var/lib/nsdhm ] || chown nsd.nsd /var/lib/nsdhm
+
echo -n $"Starting nsd:"
$NSDC_PROG -c $NSD_CONF rebuild >/dev/null 2>&1
$NSD_PROG -c $NSD_CONF $OTHER_NSD_OPTS
Index: nsd.spec
===================================================================
RCS file: /cvs/extras/rpms/nsd/F-11/nsd.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- nsd.spec 20 Aug 2009 15:28:12 -0000 1.56
+++ nsd.spec 6 Jan 2010 21:24:48 -0000 1.57
@@ -1,7 +1,7 @@
Summary: Fast and lean authoritative DNS Name Server
Name: nsd
-Version: 3.2.3
-Release: 2%{?dist}
+Version: 3.2.4
+Release: 1%{?dist}
License: BSD
Url: http://www.nlnetlabs.nl/%{name}/
Source: http://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz
@@ -97,6 +97,9 @@ if [ "$1" -ge "1" ]; then
fi
%changelog
+* Wed Jan 06 2010 Paul Wouters <paul at xelerance.com> - 3.2.4-1
+- Upgraded to 3.2.4. Minor fixes to cron/init/sysconfig scripts
+
* Thu Aug 20 2009 Ville Mattila <vmattila at csc.fi> - 3.2.3-2
- The 'nsdc patch' and 'nsdc rebuild' commands wrote a %%1 file by mistake
Index: nsd.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/nsd/F-11/nsd.sysconfig,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- nsd.sysconfig 4 Jun 2009 20:59:35 -0000 1.3
+++ nsd.sysconfig 6 Jan 2010 21:24:48 -0000 1.4
@@ -20,6 +20,9 @@ OTHER_NSD_OPTS=""
# Path to nsd program
#NSD_PROG="/usr/sbin/nsd"
+# Path to nsd-checkconf program
+#NSD_CHECKCONF_PROG="/usr/sbin/nsd-checkconf"
+
# NSD pid file
#NSD_PIDFILE="/var/run/nsd/nsd.pid"
@@ -27,4 +30,9 @@ OTHER_NSD_OPTS=""
# parameter set in nsd.conf)
#NSD_XFRDFILE="/var/lib/nsd/xfrd.state"
+# NSD_AUTOREBUILD: Choose with "yes" or "no" whether NSD database should
+# be rebuilt and reloaded automatically hourly by /etc/cron.hourly/nsd script.
+# (Default value is set in the script.)
+#NSD_AUTOREBUILD="no"
+
# EOF
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nsd/F-11/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources 17 Aug 2009 14:53:55 -0000 1.23
+++ sources 6 Jan 2010 21:24:48 -0000 1.24
@@ -1,2 +1,3 @@
a0dcb0a3b3c1a8d386125eeafe403f58 nsd-3.2.2.tar.gz
5ddb35dfb7da0defb82cda4f7388cba2 nsd-3.2.3.tar.gz
+0c394fd713d194bde24a1035e56d5a79 nsd-3.2.4.tar.gz
More information about the fedora-extras-commits
mailing list