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

diff --git a/modules/ntp/manifests/init.pp b/modules/ntp/manifests/init.pp
index 0cfb62563..018e5fcbc 100644
--- a/modules/ntp/manifests/init.pp
+++ b/modules/ntp/manifests/init.pp
@@ -1,27 +1,24 @@
 class ntp {
-
 	package { 'ntp':
 		ensure => installed
 	}
 
-	if ($::lsbmajdistrelease >= 8) {
-		service { 'ntp':
-			ensure  => stopped,
-			require => Package['ntp']
-		}
-	} else {
-		service { 'ntp':
-			ensure  => running,
-			require => Package['ntp']
-		}
+	service { 'ntp':
+		ensure  => running,
+		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,
@@ -42,7 +39,13 @@ class ntp {
 		require => Package['ntp'],
 	}
 
-	if getfromhash($site::nodeinfo, 'timeserver') {
+	munin::check { [
+			'ntp_offset',
+			'ntp_states',
+			]:
+	}
+
+	if getfromhash($deprecated::nodeinfo, 'timeserver') {
 		include ntp::timeserver
 	} else {
 		include ntp::client