X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fntp%2Fmanifests%2Finit.pp;h=018e5fcbc72b4188cb8bcc9bbe50e930d2e921a2;hb=7733f6f9b0bc96b9b2fc45cc5c821994f5b42b5e;hp=ace2f8f8dbb886e257aa06668bf33a54b655c124;hpb=78ceca7ca6540a83d24a89016263235c923543db;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ntp/manifests/init.pp b/modules/ntp/manifests/init.pp
index ace2f8f8d..018e5fcbc 100644
--- a/modules/ntp/manifests/init.pp
+++ b/modules/ntp/manifests/init.pp
@@ -1,33 +1,53 @@
 class ntp {
-	package { ntp: ensure => installed }
-	file {	"/var/lib/ntp/":
-			ensure  => directory,
-			owner   => ntp,
-			group   => ntp,
-			mode    => 755
-			;
-		"/var/lib/ntpstats":
-			ensure  => directory,
-			owner   => ntp,
-			group   => ntp,
-			mode    => 755
-			;
-		"/etc/ntp.conf":
-			owner   => root,
-			group   => root,
-			mode    => 444,
-			content => template("ntp/ntp.conf"),
-			notify  => Exec["ntp restart"],
-			require => Package["ntp"]
-			;
-	}
-	exec { "ntp restart":
-		path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-		refreshonly => true,
-	}
-        @ferm::rule { "dsa-ntp":
-                domain          => "(ip ip6)",
-                description     => "Allow ntp access",
-                rule            => "proto udp mod state state (NEW) dport (123) ACCEPT"
-        }
+	package { 'ntp':
+		ensure => installed
+	}
+
+	service { 'ntp':
+		ensure  => running,
+		require => Package['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,
+		group   => ntp,
+		mode    => '0755',
+		require => Package['ntp']
+	}
+	file { '/etc/ntp.conf':
+		content => template('ntp/ntp.conf'),
+		notify  => Service['ntp'],
+		require => Package['ntp'],
+	}
+	file { '/etc/ntp.keys.d':
+		ensure  => directory,
+		group   => 'ntp',
+		mode    => '0750',
+		notify  => Service['ntp'],
+		require => Package['ntp'],
+	}
+
+	munin::check { [
+			'ntp_offset',
+			'ntp_states',
+			]:
+	}
+
+	if getfromhash($deprecated::nodeinfo, 'timeserver') {
+		include ntp::timeserver
+	} else {
+		include ntp::client
+	}
 }