X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fntp%2Fmanifests%2Fclient.pp;h=9cee0619b91929a4001e2fe4d900d1787486d444;hb=bf2de708c73c0aee3af2585726515671284e0d9e;hp=d7eb61876fec0e91533dbca735afd2a871766125;hpb=045356a8f784c5963e06a25a7dec3ae2a3ca0961;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ntp/manifests/client.pp b/modules/ntp/manifests/client.pp
index d7eb61876..9cee0619b 100644
--- a/modules/ntp/manifests/client.pp
+++ b/modules/ntp/manifests/client.pp
@@ -16,17 +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_dijkstra':
-		source => 'puppet:///modules/ntp/ntpkey_iff_dijkstra.pub',
+	file { '/etc/ntp.keys.d/ntpkey_iff_ubc-bl2':
+		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_ubc-bl6':
+		ensure => absent,
 	}
-
-	file { '/etc/ntp.keys.d/ntpkey_iff_merikanto':
+	file { '/etc/ntp.keys.d/ntpkey_iff_dijkstra':
 		ensure => absent,
 	}
-	file { '/etc/ntp.keys.d/ntpkey_iff_orff':
+	file { '/etc/ntp.keys.d/ntpkey_iff_luchesi':
 		ensure => absent,
 	}
 	file { '/etc/ntp.keys.d/ntpkey_iff_ravel':
@@ -35,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',
+	}
 }