From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 16 Sep 2010 11:30:42 +0000 (+0200)
Subject: On squeeze the iff file has a different name
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=d883215e76211efea1599f68d5e8685ef0cd3d81

On squeeze the iff file has a different name
---

diff --git a/modules/ntp/files/etc-default-ntp b/modules/ntp/files/etc-default-ntp
index 68df5554..0e77066f 100644
--- a/modules/ntp/files/etc-default-ntp
+++ b/modules/ntp/files/etc-default-ntp
@@ -14,7 +14,8 @@ h="`hostname`"
 KEYSDIR="/etc/ntp.keys.d"
 if ! [ -e "$KEYSDIR/ntpkey_cert_$h" ] ||
    ! [ -e "$KEYSDIR/ntpkey_host_$h" ] ||
-   ! [ -e "$KEYSDIR/ntpkey_iff_$h" ]; then
+   (! [ -e "$KEYSDIR/ntpkey_iff_$h" ] &&
+    ! [ -e "$KEYSDIR/ntpkey_iffkey_$h" ]); then
 	# on a "server" we would have to add -T to the ntp-keygen call
 	# and then run something like this:
 	#