X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fntp%2Fmanifests%2Fclient.pp;h=12c580468b01fce79c83d2f8651cf70553ec474c;hb=0da1af36e2aa3aafc65e54135c7ec36da7acff91;hp=9fd93565255b15fddb8f3d5d901b09fba98d7d9e;hpb=e92eea431bf48910e63f6f9ffdf3cce7b7e3a2fe;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ntp/manifests/client.pp b/modules/ntp/manifests/client.pp
index 9fd935652..12c580468 100644
--- a/modules/ntp/manifests/client.pp
+++ b/modules/ntp/manifests/client.pp
@@ -4,23 +4,29 @@ 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':
-		source => 'puppet:///modules/ntp/ntpkey_iff_ubc-bl2.pub',
+		ensure => absent,
 	}
 	file { '/etc/ntp.keys.d/ntpkey_iff_ubc-bl6':
-		source => 'puppet:///modules/ntp/ntpkey_iff_ubc-bl6.pub',
+		ensure => absent,
 	}
 	file { '/etc/ntp.keys.d/ntpkey_iff_dijkstra':
 		ensure => absent,
@@ -31,7 +37,8 @@ class ntp::client {
 	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',
 	}
 }