rpms/dnssec-conf/devel dnssec-conf.spec,1.23,1.24

[Paul Wouters]

Author: pwouters

Update of /cvs/extras/rpms/dnssec-conf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28672

Modified Files:
	dnssec-conf.spec 
Log Message:
Fixed updatng named.dnssec.keys file using a triggerpostun.



Index: dnssec-conf.spec
===================================================================
RCS file: /cvs/extras/rpms/dnssec-conf/devel/dnssec-conf.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- dnssec-conf.spec	4 Feb 2010 17:13:39 -0000	1.23
+++ dnssec-conf.spec	4 Feb 2010 19:42:48 -0000	1.24
@@ -49,18 +49,26 @@ install -m 0644 packaging/fedora/dnssec.
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
-%post
+%triggerpostun -- %{name} < %{version}-%{release}
+echo "triggering"
+find /etc/pki/dnssec-keys/
+# This cannot be in %post because we need to previous pacakge's key files
+# that we no longer ship to be removed before we can update named.dnssec.keys
+#
 # If we remove all trust anchors, not just the reverse, we could just undo
 # the include for named.dnssec.keys, as the dlv is included for named
 # seaerately.
-# 
+#
+# in case /etc/sysconfig/dnssec has been emptied
+DNSSEC="off"
+DLV="off" 
 if [ -r /etc/sysconfig/dnssec ]; then
     . /etc/sysconfig/dnssec
 fi
     # we need --nocheck because we might have deleted keys referenced in
     # the bind config, so named-checkconf will fail.
-    dnssec-configure -b --nocheck --norestart --dnssec="$DNSSEC" --dlv="$DLV" \
-     /dev/null 2>&1
+    %{_sbindir}/dnssec-configure -b --nocheck --norestart --dnssec="$DNSSEC" --dlv="$DLV" \
+     > /dev/null 2>&1
 
 # restart DNS servers which might be using DNSSEC keys
 /sbin/service named try-restart >/dev/null 2>&1 || :;
@@ -85,6 +93,8 @@ fi
 * Thu Feb 04 2010 Paul Wouters <paul at xelerance.com> - 1.22-4
 - Do not ship DNSSEC trust anchors for in-addr.arpa zones. Rely on the DLV
   and (from July 2010 onwards) the signed root
+- Fix --nocheck option to work with bind
+- Use triggerpostun to recreate an updated named.dnssec.keys
 
 * Fri Jan 29 2010 Stepan Kasal <skasal at redhat.com> - 1.22-3
 - better be ready for bind 9.8.x an 9.9.x as well...