X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fntp%2Fmanifests%2Fclient.pp;h=6e8765c44fe00ba4d747317b66b9363e056bf3cd;hb=fb8384f7db14e205bd3a900a2ccf162308890e68;hp=cc6964b553b06a67d7cb0253405988b9206710fb;hpb=d656940e8a36439fa782a2f2966087d5cbebd66c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ntp/manifests/client.pp b/modules/ntp/manifests/client.pp
index cc6964b55..6e8765c44 100644
--- a/modules/ntp/manifests/client.pp
+++ b/modules/ntp/manifests/client.pp
@@ -1,11 +1,19 @@
-class ntp::client inherits ntp {
-	file { "/etc/ntp.conf":
-		owner   => root,
-		group   => root,
-		mode    => 440,
-		source  => [ "puppet:///ntp/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',
 	}
 }