From 8e88668629f21ce4fd4687c763afbcab703f296c Mon Sep 17 00:00:00 2001
From: Paul Wouters <pwouters@redhat.com>
Date: Aug 14 2018 01:42:57 +0000
Subject: Resolves: rhbz#1468477 nsd-keygen unit does not generate keys if it's already started


---

diff --git a/nsd-keygen.service b/nsd-keygen.service
index 327115e..cb28fc0 100644
--- a/nsd-keygen.service
+++ b/nsd-keygen.service
@@ -3,6 +3,10 @@ Description=NSD Control Key And Certificate Generator
 After=syslog.target 
 Before=nsd.service
 ConditionPathExists=!/etc/nsd/nsd_control.key
+ConditionPathExists=!/etc/nsd/nsd_control.pem
+ConditionPathExists=!/etc/nsd/nsd_server.key
+ConditionPathExists=!/etc/nsd/nsd_server.pem
+PartOf=nsd.service
 
 [Service]
 Type=oneshot
diff --git a/nsd.spec b/nsd.spec
index 48128a6..9696006 100644
--- a/nsd.spec
+++ b/nsd.spec
@@ -167,6 +167,7 @@ chown nsd:nsd %{_sharedstatedir}/nsd/* 2>&1 || :
 - Resolves: rhbz#1609774 Updated to 4.1.24)
 - Enable systemd for readiness signalling
 - Enable local unix domain socket /run/nsd/nsd.ctl for nsd-control
+- Resolves: rhbz#1468477 nsd-keygen unit does not generate keys if it's already started
 
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.22-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild