ferm cleanup: bmdb1:dedup

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

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index c1e3c52..f33c8ba 100644 (file)
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -38,10 +38,6 @@ class ferm {
                .map |$addr| { "ip_${addr}" }
        munin::ipv6check { $munin6_ips: }
 
-       # get rid of old stuff
-       $munin6_ip6s = split(regsubst($::v6ips, '([^,]+)', 'ip6_\1', 'G'), ',')
-       munin::check { $munin6_ip6s: ensure => absent }
-
        file { '/etc/ferm':
                ensure  => directory,
                notify  => Service['ferm'],
@@ -86,10 +82,31 @@ class ferm {
                content => template('ferm/defs.conf.erb'),
                notify  => Service['ferm'],
        }
-       file { '/etc/ferm/conf.d/interfaces.conf':
-               content => template('ferm/interfaces.conf.erb'),
+
+       file { '/etc/ferm/conf.d/50-munin-interfaces.conf':
+               content => template('ferm/conf.d-munin-interfaces.conf.erb'),
+               notify  => Service['ferm'],
+       }
+       @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':
+               prio        => '001',
+               description => 'munin accounting',
+               chain       => 'OUTPUT',
+               domain      => '(ip ip6)',
+               rule        => 'saddr ($MUNIN_IPS) NOP'
+       }
+
+       file { '/etc/ferm/dsa.d/010-base.conf':
+               content => template('ferm/dsa.d-010-base.conf.erb'),
                notify  => Service['ferm'],
        }
+
        augeas { 'logrotate_ulogd2':
                context => '/files/etc/logrotate.d/ulogd2',
                changes => [