Try to avoid reserved site keyword

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

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index 196a39e..daab55f 100644 (file)
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -7,10 +7,6 @@
 #   include ferm
 #
 class ferm {
-       # realize (i.e. enable) all @ferm::rule virtual resources
-       Ferm::Rule <| |>
-       Ferm::Conf <| |>
-
        File { mode => '0400' }
 
        package { 'ferm':
@@ -35,12 +31,12 @@ class ferm {
        }
 
 
-       $munin_ips = getfromhash($site::nodeinfo, 'misc', 'v4addrs')
+       $munin_ips = getfromhash($deprecated::nodeinfo, 'misc', 'v4addrs')
                .map |$addr| { "ip_${addr}" }
 
        munin::check { $munin_ips: script => 'ip_', }
 
-       $munin6_ips = getfromhash($site::nodeinfo, 'misc', 'v6addrs')
+       $munin6_ips = getfromhash($deprecated::nodeinfo, 'misc', 'v6addrs')
                .map |$addr| { "ip_${addr}" }
        munin::ipv6check { $munin6_ips: }
 
@@ -93,14 +89,14 @@ class ferm {
                content => template('ferm/conf.d-munin-interfaces.conf.erb'),
                notify  => Exec['ferm reload'],
        }
-       @ferm::rule { 'dsa-munin-interfaces-in':
+       ferm::rule { 'dsa-munin-interfaces-in':
                prio        => '001',
                description => 'munin accounting',
                chain       => 'INPUT',
                domain      => '(ip ip6)',
                rule        => 'daddr ($MUNIN_IPS) NOP'
        }
-       @ferm::rule { 'dsa-munin-interfaces-out':
+       ferm::rule { 'dsa-munin-interfaces-out':
                prio        => '001',
                description => 'munin accounting',
                chain       => 'OUTPUT',