X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fntp%2Fmanifests%2Finit.pp;h=018e5fcbc72b4188cb8bcc9bbe50e930d2e921a2;hb=d0c098685b92334a611a0c596a35f538b95ead47;hp=74a5a322e269956643520d40b652b361a410151f;hpb=24409d094a53a1ef3c4abeaf707541a00c24f800;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ntp/manifests/init.pp b/modules/ntp/manifests/init.pp
index 74a5a322e..018e5fcbc 100644
--- a/modules/ntp/manifests/init.pp
+++ b/modules/ntp/manifests/init.pp
@@ -1,107 +1,53 @@
 class ntp {
-    package { ntp: ensure => installed }
-    file {
-        "/var/lib/ntp/":
-            ensure  => directory,
-            owner   => ntp,
-            group   => ntp,
-            mode    => 755,
-            require => Package["ntp"]
-            ;
-        "/var/lib/ntp":
-            ensure  => directory,
-            owner   => ntp,
-            group   => ntp,
-            mode    => 755,
-            require => Package["ntp"]
-            ;
-        "/etc/ntp.conf":
-            owner   => root,
-            group   => root,
-            mode    => 444,
-            content => template("ntp/ntp.conf"),
-            notify  => Exec["ntp restart"],
-            require => Package["ntp"]
-            ;
-        "/etc/ntp.keys.d":
-            owner   => root,
-            group   => ntp,
-            mode    => 750,
-            ensure  => directory,
-            require => Package["ntp"]
-            ;
-    }
-    case getfromhash($nodeinfo, 'timeserver') {
-        true: {
-            file {
-                "/var/lib/ntp/leap-seconds.list":
-                    owner   => root,
-                    group   => root,
-                    mode    => 444,
-                    source  => [ "puppet:///modules/ntp/leap-seconds.list" ],
-                    require => Package["ntp"],
-                    notify  => Exec["ntp restart"],
-                    ;
-            }
-        }
-        default: {
-            file {
-                "/etc/default/ntp":
-                    owner   => root,
-                    group   => root,
-                    mode    => 444,
-                    source  => [ "puppet:///modules/ntp/etc-default-ntp" ],
-                    require => Package["ntp"],
-                    notify  => Exec["ntp restart"],
-                    ;
+	package { 'ntp':
+		ensure => installed
+	}
 
-                "/etc/ntp.keys.d/ntpkey_iff_merikanto":
-                    owner   => root,
-                    group   => root,
-                    mode    => 444,
-                    source  => [ "puppet:///modules/ntp/ntpkey_iff_merikanto.pub" ],
-                    require => Package["ntp"],
-                    notify  => Exec["ntp restart"],
-                    ;
-                "/etc/ntp.keys.d/ntpkey_iff_orff":
-                    owner   => root,
-                    group   => root,
-                    mode    => 444,
-                    source  => [ "puppet:///modules/ntp/ntpkey_iff_orff.pub" ],
-                    require => Package["ntp"],
-                    notify  => Exec["ntp restart"],
-                    ;
-                "/etc/ntp.keys.d/ntpkey_iff_ravel":
-                    owner   => root,
-                    group   => root,
-                    mode    => 444,
-                    source  => [ "puppet:///modules/ntp/ntpkey_iff_ravel.pub" ],
-                    require => Package["ntp"],
-                    notify  => Exec["ntp restart"],
-                    ;
-                "/etc/ntp.keys.d/ntpkey_iff_busoni":
-                    owner   => root,
-                    group   => root,
-                    mode    => 444,
-                    source  => [ "puppet:///modules/ntp/ntpkey_iff_busoni.pub" ],
-                    require => Package["ntp"],
-                    notify  => Exec["ntp restart"],
-                    ;
-            }
-        }
-    }
+	service { 'ntp':
+		ensure  => running,
+		require => Package['ntp']
+	}
 
+	ferm::rule { 'dsa-ntp':
+		domain      => '(ip ip6)',
+		description => 'Allow ntp access',
+		rule        => '&SERVICE(udp, 123)'
+	}
 
-    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            => "&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
+	}
 }
-# vim:set et:
-# vim:set sts=4 ts=4:
-# vim:set shiftwidth=4: