X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fntp%2Ffiles%2Fetc-default-ntp;h=d5bcb4287245ac8ed0dd52781f10d36061a43e4b;hb=2835c1daf1a5f55ec56366fa5d534b6bfc7728cb;hp=0e77066f67aa60ebf672a998555b347fcde72f6d;hpb=d883215e76211efea1599f68d5e8685ef0cd3d81;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ntp/files/etc-default-ntp b/modules/ntp/files/etc-default-ntp
index 0e77066f6..d5bcb4287 100644
--- a/modules/ntp/files/etc-default-ntp
+++ b/modules/ntp/files/etc-default-ntp
@@ -7,6 +7,8 @@
 #
 NTPD_OPTS='-g'
 
+rm -vf /var/lib/ntp/ntp.conf.dhcp
+
 #
 # make sure this host already has ntp keys:
 #
@@ -39,6 +41,6 @@ if ! [ -e "$KEYSDIR/ntpkey_cert_$h" ] ||
 	# on the client this is all we need:
 	if [ -x /usr/sbin/ntp-keygen ] ; then
 		[ -d "$KEYSDIR" ] || install -d -o root -g ntp -m 770 "$KEYSDIR"
-		( cd "$KEYSDIR" && RANDFILE=/dev/urandom /usr/sbin/ntp-keygen -I -H -c RSA-SHA1 -m 1024 )
+		( cd "$KEYSDIR" && RANDFILE=/dev/urandom /usr/sbin/ntp-keygen -I -H -c RSA-SHA256 -m 2048 )
 	fi
 fi