Try to avoid reserved site keyword

[mirror/dsa-puppet.git] / modules / ntp / manifests / init.pp

diff --git a/modules/ntp/manifests/init.pp b/modules/ntp/manifests/init.pp
index 26aa2d4..018e5fc 100644 (file)
--- 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