[dnssec-trigger] * Wed Feb 22 2012 Paul Wouters <pwouters at redhat.com> - 0.10-3 - Fix the systemd startup to require u

[Paul Wouters]

commit 1fa86d2dac44eb769ad1900da499defae54bd202
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Feb 22 20:13:51 2012 -0500

    * Wed Feb 22 2012 Paul Wouters <pwouters at redhat.com> - 0.10-3
    - Fix the systemd startup to require unbound
    - dnssec-triggerd no longer forks, giving systemd more control

 dnssec-trigger.spec     |    6 +++++-
 dnssec-triggerd.service |    7 +++++--
 2 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/dnssec-trigger.spec b/dnssec-trigger.spec
index 526909e..1ff6e0f 100644
--- a/dnssec-trigger.spec
+++ b/dnssec-trigger.spec
@@ -1,7 +1,7 @@
 Summary: NetworkManager plugin to update/reconfigure DNSSEC resolving
 Name: dnssec-trigger
 Version: 0.10
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/downloads/dnssec-trigger/
 Source: http://www.nlnetlabs.nl/downloads/dnssec-trigger/%{name}-%{version}.tar.gz
@@ -88,6 +88,10 @@ fi
     /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 
 %changelog
+* Wed Feb 22 2012 Paul Wouters <pwouters at redhat.com> - 0.10-3
+- Fix the systemd startup to require unbound
+- dnssec-triggerd no longer forks, giving systemd more control
+
 * Wed Feb 22 2012 Paul Wouters <pwouters at redhat.com> - 0.10-2
 - The NM hook was not modified at the right time during build
 
diff --git a/dnssec-triggerd.service b/dnssec-triggerd.service
index 5251e99..f1e8900 100644
--- a/dnssec-triggerd.service
+++ b/dnssec-triggerd.service
@@ -3,12 +3,15 @@ Description=Reconfigure local DNS(SEC) resolver on network change
 After=syslog.target network.target
 After=dnssec-triggerd-keygen.service
 Wants=dnssec-triggerd-keygen.service
+After=unbound.service
+Wants=unbound.service
 
 [Service]
-Type=forking
 PIDFile=/var/run/dnssec-triggerd.pid
 #EnvironmentFile=-/etc/sysconfig/dnssec-trigger
-ExecStart=/usr/sbin/dnssec-triggerd
+ExecStart=/usr/sbin/dnssec-triggerd -d
+Restart=always
+RestartSec=0
 
 [Install]
 WantedBy=multi-user.target