X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fntp%2Fmanifests%2Fclient.pp;h=12c580468b01fce79c83d2f8651cf70553ec474c;hb=30caaa85aed7015ca0d77216bff175eebd917eb7;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..12c580468 100644
--- a/modules/ntp/manifests/client.pp
+++ b/modules/ntp/manifests/client.pp
@@ -4,28 +4,41 @@ class ntp::client {
 		require => Package['ntp'],
 		notify  => Service['ntp']
 	}
-	file { '/etc/ntp.keys.d/ntpkey_iff_czerny':
-		source => 'puppet:///modules/ntp/ntpkey_iff_czerny.pub',
-	}
-	file { '/etc/ntp.keys.d/ntpkey_iff_clementi':
-		source => 'puppet:///modules/ntp/ntpkey_iff_clementi.pub',
-	}
 	file { '/etc/ntp.keys.d/ntpkey_iff_bm-bl1':
 		source => 'puppet:///modules/ntp/ntpkey_iff_bm-bl1.pub',
 	}
 	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_manda-node03':
+		source => 'puppet:///modules/ntp/ntpkey_iff_manda-node03.pub',
+	}
+	file { '/etc/ntp.keys.d/ntpkey_iff_manda-node04':
+		source => 'puppet:///modules/ntp/ntpkey_iff_manda-node04.pub',
+	}
+	file { '/etc/ntp.keys.d/ntpkey_iff_clementi':
+		ensure => absent,
+	}
+	file { '/etc/ntp.keys.d/ntpkey_iff_czerny':
+		ensure => absent,
+	}
+	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',
+		ensure => absent,
 	}
 	file { '/etc/ntp.keys.d/ntpkey_iff_ravel':
 		ensure => absent,
 	}
-	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',
 	}
 }