X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fntp%2Fmanifests%2Fclient.pp;h=9fd93565255b15fddb8f3d5d901b09fba98d7d9e;hb=e92eea431bf48910e63f6f9ffdf3cce7b7e3a2fe;hp=c30316c75b1f91d69e64caeca9c3e86382562858;hpb=2dc9d95e7cc2f8ddde650b03a83c0f67b2e52cd9;p=dsa-puppet.git

diff --git a/modules/ntp/manifests/client.pp b/modules/ntp/manifests/client.pp
index c30316c7..9fd93565 100644
--- a/modules/ntp/manifests/client.pp
+++ b/modules/ntp/manifests/client.pp
@@ -1,11 +1,37 @@
-class ntp::client inherits ntp {
-	file { "/etc/ntp.conf":
-		owner   => root,
-		group   => root,
-		mode    => 444,
-		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_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':
+		source => 'puppet:///modules/ntp/ntpkey_iff_ubc-bl2.pub',
+	}
+	file { '/etc/ntp.keys.d/ntpkey_iff_ubc-bl6':
+		source => 'puppet:///modules/ntp/ntpkey_iff_ubc-bl6.pub',
+	}
+	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 { '/etc/ntp.keys.d/ntpkey_iff_busoni':
+		ensure => absent,
 	}
 }