X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Finit.pp;h=e23e15d964e87cbd091369fe03df33232aed248a;hb=73ec3c6cb0d17ac675892da9bfa986ebf510f859;hp=06bafa9c692eb350dd3795a8cb3b75c8d325723d;hpb=2da9347e3403929ef8fa36f76cce777d9701c082;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index 06bafa9c6..e23e15d96 100644
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -16,18 +16,12 @@ class ferm {
 	package { 'ferm':
 		ensure => installed
 	}
-	if (versioncmp($::lsbmajdistrelease, '8') >= 0) {
-		package { 'ulogd2':
-			ensure => installed
-		}
-		package { 'ulogd':
-			# Remove instead of purge ulogd because it deletes log files on purge.
-			ensure => absent
-		}
-	} else {
-		package { 'ulogd':
-			ensure => installed
-		}
+	package { 'ulogd2':
+		ensure => installed
+	}
+	package { 'ulogd':
+		# Remove instead of purge ulogd because it deletes log files on purge.
+		ensure => absent
 	}
 
 	service { 'ferm':
@@ -35,18 +29,14 @@ class ferm {
 		status      => '/bin/true',
 	}
 
-	$munin_ips = split(regsubst($::v4ips, '([^,]+)', 'ip_\1', 'G'), ',')
+	$munin_ips = getfromhash($site::nodeinfo, 'misc', 'v4addrs')
+		.map |$addr| { "ip_${addr}" }
 
 	munin::check { $munin_ips: script => 'ip_', }
 
-	if $v6ips {
-		$munin6_ips = split(regsubst($::v6ips, '([^,]+)', 'ip_\1', 'G'), ',')
-		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,
@@ -96,31 +86,23 @@ class ferm {
 		content => template('ferm/interfaces.conf.erb'),
 		notify  => Service['ferm'],
 	}
-	if (versioncmp($::lsbmajdistrelease, '8') >= 0) {
-		augeas { 'logrotate_ulogd2':
-			context => '/files/etc/logrotate.d/ulogd2',
-			changes => [
-				'set rule/schedule daily',
-				'set rule/delaycompress delaycompress',
-				'set rule/rotate 10',
-				'set rule/ifempty notifempty',
-			],
-		}
-		file { '/etc/logrotate.d/ulogd':
-			ensure  => absent,
-		}
-		file { '/etc/logrotate.d/ulogd.dpkg-bak':
-			ensure  => absent,
-		}
-		file { '/etc/logrotate.d/ulogd.dpkg-dist':
-			ensure  => absent,
-		}
-	} else {
-		file { '/etc/logrotate.d/ulogd':
-			source  => 'puppet:///modules/ferm/logrotate-ulogd',
-			mode    => '0444',
-			require => Package['debian.org'],
-		}
+	augeas { 'logrotate_ulogd2':
+		context => '/files/etc/logrotate.d/ulogd2',
+		changes => [
+			'set rule/schedule daily',
+			'set rule/delaycompress delaycompress',
+			'set rule/rotate 10',
+			'set rule/ifempty notifempty',
+		],
+	}
+	file { '/etc/logrotate.d/ulogd':
+		ensure  => absent,
+	}
+	file { '/etc/logrotate.d/ulogd.dpkg-bak':
+		ensure  => absent,
+	}
+	file { '/etc/logrotate.d/ulogd.dpkg-dist':
+		ensure  => absent,
 	}
 
 }