From 301b0b11b4db0d2ba699c963b9f83ad8fd94efdb Mon Sep 17 00:00:00 2001
From: Fabio Alessandro Locati <fabio@locati.cc>
Date: Dec 24 2015 17:40:57 +0000
Subject: Add script to be run as soon as it is installed and improve config to allow control of the daemon


---

diff --git a/nsd.conf b/nsd.conf
index 03202f6..28ea76c 100644
--- a/nsd.conf
+++ b/nsd.conf
@@ -162,4 +162,13 @@ server:
 
 database: /var/lib/nsd/nsd.db
 
+remote-control:
+        control-enable: yes
+        control-interface: 127.0.0.1
+        control-port: 8952
+        server-key-file: "/etc/nsd/nsd_server.key"
+        server-cert-file: "/etc/nsd/nsd_server.pem"
+        control-key-file: "/etc/nsd/nsd_control.key"
+        control-cert-file: "/etc/nsd/nsd_control.pem"
+
 include: /etc/nsd/conf.d/*.conf
diff --git a/nsd.spec b/nsd.spec
index 02a60ba..84ddc06 100644
--- a/nsd.spec
+++ b/nsd.spec
@@ -1,7 +1,7 @@
 Summary: Fast and lean authoritative DNS Name Server
 Name: nsd
 Version: 4.1.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
 Source: http://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz
@@ -105,6 +105,7 @@ exit 0
 
 %post
 %systemd_post nsd.service
+nsd-control-setup
 
 %preun
 %systemd_preun nsd.service
@@ -123,10 +124,18 @@ exit 0
 /bin/systemctl try-restart nsd.service >/dev/null 2>&1 || :
 
 %changelog
+* Thu Dec 24 2015 Fabio Alessandro Locati <fabio@locati.cc> - 4.1.7-2
+- Run nsd-control-setup as soon as the package is installed
+- Improve config to allow control
+- Fix changelog to respect cronological order
+
 * Sun Dec 20 2015 Fabio Alessandro Locati <fabio@locati.cc> - 4.1.7-1
 - Update to last upstream
 - Multiple tests and fixes
 
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.18-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
 * Sat Apr 11 2015 Paul Wouters <pwouters@redhat.com> - 4.1.1-1
 - Updated to 4.1.1
 - Updated cron job for new nsd-control
@@ -139,9 +148,6 @@ exit 0
 - chown /var/lib/nsd/nsd.db to the nsd user required for nsd4
 - Add logrotate support
 
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.18-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.18-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild