schroot has to be on hold on wheezy

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

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index 4332dad..bb9e81b 100644 (file)
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -14,7 +14,6 @@ class ferm {
        service { 'ferm':
                hasstatus   => false,
                status      => '/bin/true',
-               refreshonly => true,
        }
 
        $munin_ips = split(regsubst($v4ips, '([^,]+)', 'ip_\1', 'G'), ',')
@@ -23,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
@@ -38,6 +37,7 @@ class ferm {
        }
        file { '/etc/ferm/dsa.d':
                ensure => directory,
+               mode   => '0555',
                purge   => true,
                force   => true,
                recurse => true,
@@ -45,11 +45,13 @@ 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',
@@ -64,7 +66,8 @@ class ferm {
                content => template('ferm/interfaces.conf.erb'),
        }
        file { '/etc/logrotate.d/ulogd':
-               source => 'puppet:///modules/ferm/logrotate-ulogd',
+               source  => 'puppet:///modules/ferm/logrotate-ulogd',
+               mode    => '0444',
                require => Package['debian.org'],
        }