X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fntp%2Fmanifests%2Fclient.pp;h=d36b5d49a1b8c3eeec94ad7e2b6158e2a084e072;hb=eb83c03ddda8253f230fc144574a3891fd28f874;hp=bee691c3ba184e736f051d58fb0e0d4c04040884;hpb=84d1e7a9c1728b78c3bca11e8a5505222c3b74ac;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ntp/manifests/client.pp b/modules/ntp/manifests/client.pp
index bee691c3b..d36b5d49a 100644
--- a/modules/ntp/manifests/client.pp
+++ b/modules/ntp/manifests/client.pp
@@ -16,11 +16,17 @@ 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':
+		source => 'puppet:///modules/ntp/ntpkey_iff_ubc-bl2.pub',
+	}
+	file { '/etc/ntp.keys.d/ntpkey_iff_ubc-bl6':
+		source => 'puppet:///modules/ntp/ntpkey_iff_ubc-bl6.pub',
+	}
 	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',
+		ensure => absent,
 	}
 	file { '/etc/ntp.keys.d/ntpkey_iff_ravel':
 		ensure => absent,
@@ -28,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',
+	}
 }