but this does not work

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

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index 44872de..048ce4e 100644 (file)
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -22,7 +22,7 @@ class ferm {
 
        if $v6ips {
                $munin6_ips = split(regsubst($v6ips, '([^,]+)', 'ip_\1', 'G'), ',')
-               munin::check { $munin6_ips: script => 'ip_', }
+               munin::ipv6check { $munin6_ips: }
        }
 
        # get rid of old stuff
@@ -37,6 +37,7 @@ class ferm {
        }
        file { '/etc/ferm/dsa.d':
                ensure => directory,
+               mode   => '0555',
                purge   => true,
                force   => true,
                recurse => true,
@@ -44,32 +45,40 @@ class ferm {
        }
        file { '/etc/ferm/conf.d':
                ensure => directory,
+               mode   => '0555',
        }
        file { '/etc/default/ferm':
                source  => 'puppet:///modules/ferm/ferm.default',
                require => Package['ferm'],
                notify  => Service['ferm'],
+               mode    => '0444',
        }
        file { '/etc/ferm/ferm.conf':
                source  => 'puppet:///modules/ferm/ferm.conf',
+               notify  => Service['ferm'],
        }
        file { '/etc/ferm/conf.d/me.conf':
                content => template('ferm/me.conf.erb'),
+               notify  => Service['ferm'],
        }
        file { '/etc/ferm/conf.d/defs.conf':
                content => template('ferm/defs.conf.erb'),
+               notify  => Service['ferm'],
        }
        file { '/etc/ferm/conf.d/interfaces.conf':
                content => template('ferm/interfaces.conf.erb'),
+               notify  => Service['ferm'],
        }
        file { '/etc/logrotate.d/ulogd':
-               source => 'puppet:///modules/ferm/logrotate-ulogd',
+               source  => 'puppet:///modules/ferm/logrotate-ulogd',
+               mode    => '0444',
                require => Package['debian.org'],
        }
 
        if getfromhash($site::nodeinfo, 'buildd') {
                file { '/etc/ferm/conf.d/load_ftp_conntrack.conf':
                        source => 'puppet:///modules/ferm/conntrack_ftp.conf',
+                       notify  => Service['ferm'],
                }
        }