From c2bf66086b3f11a296381d8ad4f84c59510024bb Mon Sep 17 00:00:00 2001
From: Paul Wouters <pwouters@redhat.com>
Date: Jan 20 2016 01:52:46 +0000
Subject: * Wed Jan 20 2016 Paul Wouters <pwouters@redhat.com> - 4.1.7-4

- Remove cronjob and enable zonefiles-write: in nsd.conf instead
- Do not manually run nsd-control notify - daemon already does when needed
- Do not remove xfrd.state state information

---

diff --git a/nsd.conf b/nsd.conf
index be2d3e1..733122a 100644
--- a/nsd.conf
+++ b/nsd.conf
@@ -126,7 +126,7 @@ server:
 
 	# write changed zonefiles to disk, every N seconds.
 	# default is 0(disabled) or 3600(if database is "").
-	# zonefiles-write: 3600
+	zonefiles-write: 3600
 
 	# RRLconfig
 	# Response Rate Limiting, size of the hashtable. Default 1000000.
diff --git a/nsd.cron b/nsd.cron
deleted file mode 100644
index 9871613..0000000
--- a/nsd.cron
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-# Paul Wouters <pwouters@redhat.com>
-
-# This folds back zone updates, dynamic updates, etc that nsd records
-# in the nsd.db file back into the zone files
-
-# Only check when nsd is actively running
-# sysvinit: (service nsd status has useless return codes)
-pidof nsd > /dev/null  || exit 0
-
-# Default settings - do not edit these but /etc/sysconfig/nsd instead!
-NSD_CONF="/etc/nsd/nsd.conf"
-NSDC_PROG="/usr/sbin/nsd-control"
-NSD_CHECKCONF_PROG="/usr/sbin/nsd-checkconf"
-
-# Read in local settings.
-[ -r /etc/sysconfig/nsd ] && . /etc/sysconfig/nsd
-
-# needed to avoid useless AVC rhbz#989218
-cd ~nsd
-
-${NSDC_PROG} -c ${NSD_CONF} write > /dev/null 2>&1
diff --git a/nsd.service b/nsd.service
index 00f827c..ae62cb2 100644
--- a/nsd.service
+++ b/nsd.service
@@ -10,9 +10,6 @@ PIDFile=/var/run/nsd/nsd.pid
 EnvironmentFile=-/etc/sysconfig/nsd
 ExecStart=/usr/sbin/nsd -d -c /etc/nsd/nsd.conf $NSD_EXTRA_OPTS
 ExecReload=/bin/kill -HUP $MAINPID
-# notify blocks on misconfigurations - but does show it very loudly
-ExecReload=/usr/sbin/nsd-control -c /etc/nsd/nsd.conf notify
-ExecStopPost=/bin/rm -f /var/lib/nsd/xfrd.state
 KillMode=mixed
 PrivateTmp=true
 
diff --git a/nsd.spec b/nsd.spec
index e7efe66..dbe1ff2 100644
--- a/nsd.spec
+++ b/nsd.spec
@@ -7,7 +7,7 @@
 Summary: Fast and lean authoritative DNS Name Server
 Name: nsd
 Version: 4.1.7
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/nsd/
 Group: System Environment/Daemons
@@ -19,7 +19,6 @@ Source4: nsd-write.service
 Source5: nsd-write.timer
 Source6: tmpfiles-nsd.conf
 Source10: nsd.init
-Source11: nsd.cron
 Source12: nsd.sysconfig
 BuildRequires: flex
 BuildRequires: openssl-devel
@@ -81,8 +80,6 @@ install -m 0644 %{SOURCE6} %{buildroot}%{_tmpfilesdir}/nsd.conf
 %else
 mkdir -p %{buildroot}%{_initddir}
 install -m 0755 %{SOURCE10} %{buildroot}%{_initddir}/nsd
-mkdir -p %{buildroot}%{_sysconfdir}/cron.hourly
-install -m 0755 %{SOURCE11} %{buildroot}%{_sysconfdir}/cron.hourly/nsd
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
 install -m 0755 %{SOURCE12} %{buildroot}%{_sysconfdir}/sysconfig/nsd
 %endif
@@ -120,7 +117,6 @@ rm %{buildroot}%{_sysconfdir}/nsd/nsd.conf.sample
 %attr(0644,root,root) %{_unitdir}/nsd-write.timer
 %attr(0644,root,root) %{_tmpfilesdir}/nsd.conf
 %else
-%{_sysconfdir}/cron.hourly/nsd
 %attr(0755,root,root) %{_initddir}/nsd
 %config(noreplace) %{_sysconfdir}/sysconfig/nsd
 %endif
@@ -169,6 +165,11 @@ fi
 chown nsd:nsd %{_sharedstatedir}/nsd/* 2>&1 || :
 
 %changelog
+* Wed Jan 20 2016 Paul Wouters <pwouters@redhat.com> - 4.1.7-4
+- Remove cronjob and enable zonefiles-write: in nsd.conf instead
+- Do not manually run nsd-control notify - daemon already does when needed
+- Do not remove xfrd.state state information
+
 * Mon Dec 28 2015 Paul Wouters <pwouters@redhat.com> - 4.1.7-3
 - Removed Mass rebuild changelogs causing chronological order error
 - Bump EVR required due to epel7 build