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 751e9d9..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,7 +8,7 @@ class ntp {
                require => Package['ntp']
        }
 
-       @ferm::rule { 'dsa-ntp':
+       ferm::rule { 'dsa-ntp':
                domain      => '(ip ip6)',
                description => 'Allow ntp access',
                rule        => '&SERVICE(udp, 123)'
@@ -40,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