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 0cfb625..018e5fc 100644 (file)
--- 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