X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fntp%2Fmanifests%2Fclient.pp;h=9cee0619b91929a4001e2fe4d900d1787486d444;hb=1eb059797393099ff8bbfd961718a0fd46f18379;hp=0a0c14ce186f31bc19e66b62882ace9ee8b22c31;hpb=64d91b27fc77cae70feec53e24b46421618ebdac;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ntp/manifests/client.pp b/modules/ntp/manifests/client.pp
index 0a0c14ce1..9cee0619b 100644
--- a/modules/ntp/manifests/client.pp
+++ b/modules/ntp/manifests/client.pp
@@ -16,13 +16,16 @@ class ntp::client {
 	file { '/etc/ntp.keys.d/ntpkey_iff_bm-bl2':
 		source => 'puppet:///modules/ntp/ntpkey_iff_bm-bl2.pub',
 	}
+	file { '/etc/ntp.keys.d/ntpkey_iff_ubc-bl2':
+		ensure => absent,
+	}
+	file { '/etc/ntp.keys.d/ntpkey_iff_ubc-bl6':
+		ensure => absent,
+	}
 	file { '/etc/ntp.keys.d/ntpkey_iff_dijkstra':
-		source => 'puppet:///modules/ntp/ntpkey_iff_dijkstra.pub',
+		ensure => absent,
 	}
 	file { '/etc/ntp.keys.d/ntpkey_iff_luchesi':
-		source => 'puppet:///modules/ntp/ntpkey_iff_luchesi.pub',
-	}
-	file { '/etc/ntp.keys.d/ntpkey_iff_orff':
 		ensure => absent,
 	}
 	file { '/etc/ntp.keys.d/ntpkey_iff_ravel':
@@ -31,4 +34,8 @@ class ntp::client {
 	file { '/etc/ntp.keys.d/ntpkey_iff_busoni':
 		ensure => absent,
 	}
+	file { '/usr/local/sbin/ntp-restart-if-required':
+		source => 'puppet:///modules/ntp/ntp-restart-if-required',
+		mode    => '0555',
+	}
 }