X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fntp%2Fmanifests%2Fclient.pp;h=6e8765c44fe00ba4d747317b66b9363e056bf3cd;hb=132ca45393a7d7fe277a5eb391e211d2c1775d24;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..6e8765c44 100644
--- a/modules/ntp/manifests/client.pp
+++ b/modules/ntp/manifests/client.pp
@@ -1,12 +1,19 @@
-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_merikanto':
+		source => 'puppet:///modules/ntp/ntpkey_iff_merikanto.pub',
+	}
+	file { '/etc/ntp.keys.d/ntpkey_iff_orff':
+		source => 'puppet:///modules/ntp/ntpkey_iff_orff.pub',
+	}
+	file { '/etc/ntp.keys.d/ntpkey_iff_ravel':
+		source => 'puppet:///modules/ntp/ntpkey_iff_ravel.pub',
+	}
+	file { '/etc/ntp.keys.d/ntpkey_iff_busoni':
+		source => 'puppet:///modules/ntp/ntpkey_iff_busoni.pub',
 	}
 }