X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Finit.pp;h=a912a281ff67c89d2da35188f482d296e884ff46;hb=285329e7458a2ef552135d8f5002eadd81a29806;hp=527881682bcf96ac0b838f175b90cfb0caa3ee82;hpb=ec98ab10b80a84d56e9d88198cd39910190f9f78;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index 527881682..a912a281f 100644
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -34,15 +34,9 @@ class ferm {
 
 	munin::check { $munin_ips: script => 'ip_', }
 
-	if getfromhash($site::nodeinfo, 'misc', 'v6addrs') {
-		$munin6_ips = getfromhash($site::nodeinfo, 'misc', 'v6addrs')
-			.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 }
+	$munin6_ips = getfromhash($site::nodeinfo, 'misc', 'v6addrs')
+		.map |$addr| { "ip_${addr}" }
+	munin::ipv6check { $munin6_ips: }
 
 	file { '/etc/ferm':
 		ensure  => directory,
@@ -88,8 +82,8 @@ 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'],
 	}
 	augeas { 'logrotate_ulogd2':