X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Finit.pp;h=bb9e81b153b477aaa4fefbcc56d1f92a38b07511;hb=fa4000517ba3ff1344bb0b9fdc186708d740bc4a;hp=44872de480c73198ddf799c7acf675f43da67b39;hpb=cd48f056e69f38a8278fceef4a3fa8269eca1c83;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index 44872de48..bb9e81b15 100644
--- 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,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',
@@ -63,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'],
 	}