X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fntp%2Fmanifests%2Fclient.pp;h=d75702cd829eafe9ad7d801542a3f4573824c297;hb=a4e7c18790b8adb585d3540adcea247939b2bb56;hp=0882e49d6e512c5e31b8ee0043f8e4e0fef7df57;hpb=2179167d897e4b92a6ebc85bc92ae0d4df4c029b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ntp/manifests/client.pp b/modules/ntp/manifests/client.pp
index 0882e49d6..d75702cd8 100644
--- a/modules/ntp/manifests/client.pp
+++ b/modules/ntp/manifests/client.pp
@@ -1,12 +1,38 @@
-class ntp::client inherits ntp {
-	file { "/etc/ntp.conf":
-		owner   => root,
-		group   => root,
-		mode    => 444,
-		source  => [ "puppet:///ntp/per-host/$fqdn/client.conf",
-		             "puppet:///ntp/common/client.conf" ],
-		notify  => Exec["ntp restart"],
-		require => Package["ntp"]
-		;
+class ntp::client {
+	file { '/etc/default/ntp':
+		source => 'puppet:///modules/ntp/etc-default-ntp',
+		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_ubc-bl2':
+		ensure => absent,
+	}
+	file { '/etc/ntp.keys.d/ntpkey_iff_ubc-bl6':
+		ensure => absent,
+	}
+	file { '/etc/ntp.keys.d/ntpkey_iff_dijkstra':
+		ensure => absent,
+	}
+	file { '/etc/ntp.keys.d/ntpkey_iff_luchesi':
+		ensure => absent,
+	}
+	file { '/etc/ntp.keys.d/ntpkey_iff_ravel':
+		ensure => absent,
+	}
+	file { '/usr/local/sbin/ntp-restart-if-required':
+		source => 'puppet:///modules/ntp/ntp-restart-if-required',
+		mode    => '0555',
 	}
 }