X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fntp%2Fmanifests%2Finit.pp;h=018e5fcbc72b4188cb8bcc9bbe50e930d2e921a2;hb=f8b10b0e0516ad8e0e0f2cf1ed7ab9fb73922b97;hp=26aa2d4f8fcb5ccd7168f5a9b0e3ee248f7621fa;hpb=3eb533e5499e66423bafdedaf6c7d08ead1772de;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ntp/manifests/init.pp b/modules/ntp/manifests/init.pp
index 26aa2d4f8..018e5fcbc 100644
--- a/modules/ntp/manifests/init.pp
+++ b/modules/ntp/manifests/init.pp
@@ -1,5 +1,4 @@
 class ntp {
-
 	package { 'ntp':
 		ensure => installed
 	}
@@ -9,12 +8,17 @@ class ntp {
 		require => Package['ntp']
 	}
 
-	@ferm::rule { 'dsa-ntp':
+	ferm::rule { 'dsa-ntp':
 		domain      => '(ip ip6)',
 		description => 'Allow ntp access',
 		rule        => '&SERVICE(udp, 123)'
 	}
 
+	file { '/etc/init.d/ntp':
+		source => 'puppet:///modules/ntp/ntp.init',
+		mode   => '0555',
+		notify => Exec['systemctl daemon-reload'],
+	}
 	file { '/var/lib/ntp':
 		ensure  => directory,
 		owner   => ntp,
@@ -25,17 +29,23 @@ class ntp {
 	file { '/etc/ntp.conf':
 		content => template('ntp/ntp.conf'),
 		notify  => Service['ntp'],
-		require => Package['ntp']
+		require => Package['ntp'],
 	}
 	file { '/etc/ntp.keys.d':
 		ensure  => directory,
-		group   => ntp,
+		group   => 'ntp',
 		mode    => '0750',
 		notify  => Service['ntp'],
-		require => Package['ntp']
+		require => Package['ntp'],
+	}
+
+	munin::check { [
+			'ntp_offset',
+			'ntp_states',
+			]:
 	}
 
-	if getfromhash($site::nodeinfo, 'timeserver') {
+	if getfromhash($deprecated::nodeinfo, 'timeserver') {
 		include ntp::timeserver
 	} else {
 		include ntp::client